mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
KG wip pre-0.7.35
This commit is contained in:
GRiker
commit
73be593458
@ -11,7 +11,7 @@
|
||||
- title: "Page turn animations in the e-book viewer"
|
||||
type: major
|
||||
description: >
|
||||
"Now when you use the Page Down/Page Up keys or the next/previous page buttons in the viewer, page turning will be animated. The duration of the animation can be controlled in the viewer preferences. Setting it to o disables the animation completely."
|
||||
"Now when you use the Page Down/Page Up keys or the next/previous page buttons in the viewer, page turning will be animated. The duration of the animation can be controlled in the viewer preferences. Setting it to 0 disables the animation completely."
|
||||
|
||||
- title: "Conversion pipeline: Add an option to set the minimum line height of all elemnts as a percentage of the computed font size. By default, calibre now sets the line height to 120% of the computed font size."
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 133 KiB |
831
imgsrc/edit-cut.svg
Normal file
831
imgsrc/edit-cut.svg
Normal file
@ -0,0 +1,831 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://web.resource.org/cc/"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="128"
|
||||
height="128"
|
||||
id="svg2"
|
||||
sodipodi:version="0.32"
|
||||
inkscape:version="0.45.1"
|
||||
version="1.0"
|
||||
sodipodi:docbase="/home/david/Oxygen/trunk/scalable/actions"
|
||||
sodipodi:docname="edit-cut.svgz"
|
||||
inkscape:output_extension="org.inkscape.output.svgz.inkscape"
|
||||
inkscape:export-filename="edit-cut.png"
|
||||
inkscape:export-xdpi="22.5"
|
||||
inkscape:export-ydpi="22.5">
|
||||
<defs
|
||||
id="defs4">
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient4792">
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop4794" />
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop4796" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient4758">
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop4760" />
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop4762" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient4722">
|
||||
<stop
|
||||
style="stop-color:#dfdfdf;stop-opacity:1"
|
||||
offset="0"
|
||||
id="stop4724" />
|
||||
<stop
|
||||
style="stop-color:#606060;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop4726" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient4635">
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop4637" />
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop4639" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient4618">
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop4620" />
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop4622" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient4488">
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop4490" />
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop4492" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient4445">
|
||||
<stop
|
||||
style="stop-color:#606060;stop-opacity:1"
|
||||
offset="0"
|
||||
id="stop4447" />
|
||||
<stop
|
||||
style="stop-color:#343434;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop4449" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient4253">
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop4255" />
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop4257" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3792"
|
||||
inkscape:collect="always">
|
||||
<stop
|
||||
id="stop3794"
|
||||
offset="0"
|
||||
style="stop-color:#ffffff;stop-opacity:1" />
|
||||
<stop
|
||||
id="stop3796"
|
||||
offset="1"
|
||||
style="stop-color:#e7e7e7;stop-opacity:1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient3631">
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3633" />
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop3635" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient3475">
|
||||
<stop
|
||||
style="stop-color:#eeeeee;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3477" />
|
||||
<stop
|
||||
style="stop-color:#cbcbcb;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop3479" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient3467">
|
||||
<stop
|
||||
style="stop-color:#e8e8e8;stop-opacity:1"
|
||||
offset="0"
|
||||
id="stop3469" />
|
||||
<stop
|
||||
style="stop-color:#888888;stop-opacity:0.53714287"
|
||||
offset="1"
|
||||
id="stop3471" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3176"
|
||||
inkscape:collect="always">
|
||||
<stop
|
||||
id="stop3178"
|
||||
offset="0"
|
||||
style="stop-color:#323232;stop-opacity:1;" />
|
||||
<stop
|
||||
id="stop3180"
|
||||
offset="1"
|
||||
style="stop-color:#000000;stop-opacity:1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3516"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.7547529,-0.4357568,0.4357568,0.7547529,-12.315637,39.880442)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3518"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.7547529,-0.4357568,0.4357568,0.7547529,-12.315636,39.008928)"
|
||||
x1="69.501228"
|
||||
y1="109.56824"
|
||||
x2="56.484062"
|
||||
y2="117.84955" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3520"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-0.5000017,0.8660252)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3522"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="69.501228"
|
||||
y1="109.56824"
|
||||
x2="56.484062"
|
||||
y2="117.84955" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3475"
|
||||
id="linearGradient3524"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="62.646275"
|
||||
y1="53.750923"
|
||||
x2="52.066586"
|
||||
y2="53.750923" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3526"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-0.5000017,0.8660252)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3467"
|
||||
id="linearGradient3530"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="63.553711"
|
||||
y1="16.056862"
|
||||
x2="63.553711"
|
||||
y2="63.136379" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3467"
|
||||
id="linearGradient3609"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="63.553711"
|
||||
y1="16.056862"
|
||||
x2="63.553711"
|
||||
y2="63.136379"
|
||||
gradientTransform="matrix(0.8715135,3.655296e-8,-3.655296e-8,0.8715135,8.2476912,8.4795979)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3614"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.7547529,-0.4357568,0.4357568,0.7547529,-12.315637,39.880442)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3792"
|
||||
id="linearGradient3617"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="62.646275"
|
||||
y1="53.750923"
|
||||
x2="52.066586"
|
||||
y2="53.750923"
|
||||
gradientTransform="matrix(0.8513047,-0.4911732,0.4915009,0.850737,-22.138279,32.363934)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3625"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.7547529,-0.4357568,0.4357568,0.7547529,-12.315637,39.880442)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3627"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.7547529,-0.4357568,0.4357568,0.7547529,-12.315636,39.008928)"
|
||||
x1="69.501228"
|
||||
y1="109.56824"
|
||||
x2="56.484062"
|
||||
y2="117.84955" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3631"
|
||||
id="linearGradient3637"
|
||||
x1="61.911907"
|
||||
y1="72.456772"
|
||||
x2="59.719414"
|
||||
y2="73.709625"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(1.8541426,0,0,1.8529064,-52.138638,-62.025773)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3631"
|
||||
id="linearGradient3641"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-5.0049887,0.680543,-0.6885831,-4.9465506,418.08891,395.15615)"
|
||||
x1="61.911907"
|
||||
y1="72.456772"
|
||||
x2="59.719414"
|
||||
y2="73.709625" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3467"
|
||||
id="linearGradient3644"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="63.553711"
|
||||
y1="16.056862"
|
||||
x2="63.553711"
|
||||
y2="63.136379"
|
||||
gradientTransform="matrix(-0.8715135,3.655296e-8,3.655296e-8,0.8715135,120.39367,8.4795979)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3649"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.7547529,-0.4357568,-0.4357568,0.7547529,140.957,39.880442)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3475"
|
||||
id="linearGradient3652"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="62.646275"
|
||||
y1="53.750923"
|
||||
x2="52.066586"
|
||||
y2="53.750923"
|
||||
gradientTransform="matrix(-0.7547529,-0.4357568,-0.4357568,0.7547529,140.957,39.008928)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3655"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.7547529,-0.4357568,-0.4357568,0.7547529,140.957,38.380442)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3657"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="69.501228"
|
||||
y1="109.56824"
|
||||
x2="56.484062"
|
||||
y2="117.84955"
|
||||
gradientTransform="matrix(-0.7547529,-0.4357568,-0.4357568,0.7547529,140.957,37.508928)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3669"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.7547529,-0.4357568,0.4357568,0.7547529,-12.315637,39.880442)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3671"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.7547529,-0.4357568,0.4357568,0.7547529,-12.315636,39.008928)"
|
||||
x1="69.501228"
|
||||
y1="109.56824"
|
||||
x2="56.484062"
|
||||
y2="117.84955" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3792"
|
||||
id="linearGradient3802"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.8513047,-0.4911732,-0.4915009,0.850737,150.74175,32.363934)"
|
||||
x1="62.646275"
|
||||
y1="53.750923"
|
||||
x2="52.066586"
|
||||
y2="53.750923" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3838"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.7547529,-0.4357568,-0.4357568,0.7547529,140.957,40.880442)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3847"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.7547529,-0.4357568,0.4357568,0.7547529,-12.013047,38.380442)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3849"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.7547529,-0.4357568,0.4357568,0.7547529,-12.013047,37.508928)"
|
||||
x1="69.501228"
|
||||
y1="109.56824"
|
||||
x2="56.484062"
|
||||
y2="117.84955" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3881"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.7547529,-0.4357568,-0.4357568,0.7547529,140.957,37.508928)"
|
||||
x1="69.501228"
|
||||
y1="109.56824"
|
||||
x2="56.484062"
|
||||
y2="117.84955" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient3887"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.7547529,-0.4357568,0.4357568,0.7547529,-12.013047,37.508928)"
|
||||
x1="69.501228"
|
||||
y1="109.56824"
|
||||
x2="56.484062"
|
||||
y2="117.84955" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient4006"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.8513047,-0.4911732,-0.4915009,0.850737,150.74175,33.346282)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient4085"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.8513047,-0.4911732,-0.4915009,0.850737,149.24175,36.346282)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3176"
|
||||
id="linearGradient4087"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.8513047,-0.4911732,-0.4915009,0.850737,150.74175,33.346282)"
|
||||
x1="63.245899"
|
||||
y1="107.23933"
|
||||
x2="58.32019"
|
||||
y2="107.5107" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3792"
|
||||
id="linearGradient4250"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.8513047,-0.4911732,-0.4915009,0.850737,150.74175,32.363934)"
|
||||
x1="62.646275"
|
||||
y1="53.750923"
|
||||
x2="52.066586"
|
||||
y2="53.750923" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4253"
|
||||
id="linearGradient4259"
|
||||
x1="65.414917"
|
||||
y1="63.2187"
|
||||
x2="71.566734"
|
||||
y2="58.624897"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4445"
|
||||
id="linearGradient4443"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.8513046,-0.4911732,0.4915009,0.850737,-21.796979,30.673174)"
|
||||
x1="66.410789"
|
||||
y1="111.09748"
|
||||
x2="56.771309"
|
||||
y2="111.40427" />
|
||||
<clipPath
|
||||
clipPathUnits="userSpaceOnUse"
|
||||
id="clipPath4455">
|
||||
<path
|
||||
style="fill:#343434;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 75.1875,70.0625 C 74.330819,70.112586 73.601545,70.703549 73.375,71.53125 L 71.21875,79.59375 C 71.09204,80.103085 71.170605,80.641816 71.4375,81.09375 L 89.625,112.5625 C 91.972816,116.62633 95.167933,119.72417 98.625,121.46875 C 102.08207,123.21333 105.97364,123.61751 109.15625,121.78125 C 112.33881,119.94502 113.935,116.36699 114.15625,112.5 C 114.3775,108.63301 113.28602,104.31505 110.9375,100.25 C 108.5891,96.185153 105.39577,93.080216 101.9375,91.34375 C 98.479225,89.607284 94.586162,89.2278 91.40625,91.0625 C 90.654039,91.496499 90.578013,91.480641 90,91.1875 C 89.421987,90.894359 88.429852,89.981353 87.25,88.34375 C 84.890296,85.068543 81.724299,79.185679 77.03125,71.0625 C 76.654739,70.40782 75.941586,70.021025 75.1875,70.0625 z M 97.9375,99.03125 C 99.847583,98.899901 103.29363,100.88292 105.4375,104.59375 C 106.75724,106.8781 107.33023,109.26773 107.25,111.125 C 107.16977,112.98227 106.50165,114.13243 105.59375,114.65625 C 104.68591,115.18004 103.39934,115.17251 101.75,114.3125 C 100.10066,113.45249 98.288767,111.75356 96.96875,109.46875 C 95.649001,107.18439 95.076021,104.76352 95.15625,102.90625 C 95.236479,101.04898 95.873353,99.898826 96.78125,99.375 C 97.154526,99.159631 97.520851,99.0599 97.9375,99.03125 z "
|
||||
id="path4457"
|
||||
sodipodi:nodetypes="cccccsssssssscccsssssssc" />
|
||||
</clipPath>
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
id="filter4475">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="0.47498194"
|
||||
id="feGaussianBlur4477" />
|
||||
</filter>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4488"
|
||||
id="linearGradient4494"
|
||||
x1="100.23751"
|
||||
y1="84.952927"
|
||||
x2="115.33315"
|
||||
y2="111.09933"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(1.1304268,0,0,1.1304268,-12.155804,-11.996273)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4445"
|
||||
id="linearGradient4572"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.8513046,-0.4911732,-0.4915009,0.850737,150.64081,30.673174)"
|
||||
x1="66.410789"
|
||||
y1="111.09748"
|
||||
x2="56.771309"
|
||||
y2="111.40427" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4488"
|
||||
id="linearGradient4574"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-1.1304268,0,0,1.1304268,140.99964,-11.996273)"
|
||||
x1="100.23751"
|
||||
y1="84.952927"
|
||||
x2="115.33315"
|
||||
y2="111.09933" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4618"
|
||||
id="linearGradient4624"
|
||||
x1="39.66201"
|
||||
y1="99.394554"
|
||||
x2="32.5625"
|
||||
y2="108.58216"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.7874752,0.1143529,-0.1388531,-0.6485276,62.315135,175.57221)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4445"
|
||||
id="linearGradient4630"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.8513046,-0.4911732,-0.4915009,0.850737,150.14081,34.173174)"
|
||||
x1="66.410789"
|
||||
y1="111.09748"
|
||||
x2="56.771309"
|
||||
y2="111.40427" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4445"
|
||||
id="linearGradient4632"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.8513046,-0.4911732,-0.4915009,0.850737,150.64081,30.673174)"
|
||||
x1="66.410789"
|
||||
y1="111.09748"
|
||||
x2="56.771309"
|
||||
y2="111.40427" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4635"
|
||||
id="linearGradient4641"
|
||||
x1="24.636236"
|
||||
y1="118.53715"
|
||||
x2="24.636236"
|
||||
y2="110.80067"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
id="filter4691">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="0.41898454"
|
||||
id="feGaussianBlur4693" />
|
||||
</filter>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4635"
|
||||
id="linearGradient4701"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="24.636236"
|
||||
y1="118.53715"
|
||||
x2="24.636236"
|
||||
y2="110.80067" />
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
id="filter4711">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="0.71627592"
|
||||
id="feGaussianBlur4713" />
|
||||
</filter>
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
id="filter4715">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="0.71627592"
|
||||
id="feGaussianBlur4717" />
|
||||
</filter>
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4722"
|
||||
id="radialGradient4728"
|
||||
cx="66"
|
||||
cy="54"
|
||||
fx="66.495979"
|
||||
fy="53.140942"
|
||||
r="2"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(1.0315502,-0.5959631,0.5955656,1.0308618,-34.242853,37.667027)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4758"
|
||||
id="linearGradient4764"
|
||||
x1="51.619904"
|
||||
y1="81.644371"
|
||||
x2="46.564438"
|
||||
y2="99.975533"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(3.132137,-2.5057096)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4792"
|
||||
id="linearGradient4798"
|
||||
x1="64.46875"
|
||||
y1="67.044975"
|
||||
x2="65.410522"
|
||||
y2="80.970673"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
id="filter4821">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="0.98653907"
|
||||
id="feGaussianBlur4823" />
|
||||
</filter>
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
gridtolerance="10000"
|
||||
guidetolerance="10"
|
||||
objecttolerance="10"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="4.7890625"
|
||||
inkscape:cx="64"
|
||||
inkscape:cy="64"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="g3690"
|
||||
width="128px"
|
||||
height="128px"
|
||||
showgrid="false"
|
||||
gridspacingx="2px"
|
||||
gridspacingy="2px"
|
||||
gridempspacing="4"
|
||||
inkscape:grid-points="true"
|
||||
showborder="false"
|
||||
borderlayer="false"
|
||||
inkscape:showpageshadow="false"
|
||||
inkscape:window-width="794"
|
||||
inkscape:window-height="730"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0" />
|
||||
<metadata
|
||||
id="metadata7">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1">
|
||||
<g
|
||||
id="g3690">
|
||||
<path
|
||||
style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4798);stroke-width:3.54751818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4821)"
|
||||
d="M 35.28125,14.46875 C 34.326418,15.020173 34.451101,16.184543 34.6875,16.78125 C 41.824923,35.39161 48.223262,52.347787 58.15625,70.75 L 56.625,73.21875 C 56.244936,72.547795 55.487111,72.144016 54.6875,72.21875 C 54.034234,72.275803 53.450423,72.649442 53.125,73.21875 C 48.962268,80.428813 46.167367,85.651204 44.09375,88.53125 C 43.056941,89.971273 42.203917,90.769641 41.75,91 C 41.296083,91.230359 41.306883,91.263851 40.6875,90.90625 C 37.787275,89.231804 34.269689,89.591888 31.15625,91.15625 C 28.042811,92.720612 25.164593,95.484072 23.0625,99.125 C 20.960291,102.76613 19.988354,106.64212 20.1875,110.125 C 20.386646,113.60788 21.847132,116.85528 24.75,118.53125 C 27.652918,120.20725 31.200269,119.82161 34.3125,118.25 C 37.424731,116.67839 40.273497,113.92116 42.375,110.28125 L 58.5,82.34375 C 58.674659,82.047999 58.772646,81.71253 58.78125,81.375 C 60.494006,80.173524 62.436255,79.043092 64.3125,78.25 C 66.301575,79.090643 68.394793,80.309785 70.1875,81.59375 C 70.216655,81.858831 70.304417,82.106865 70.4375,82.34375 L 86.5625,110.28125 C 88.664002,113.92116 91.544019,116.67839 94.65625,118.25 C 97.768481,119.82161 101.28458,120.20725 104.1875,118.53125 C 107.09037,116.85528 108.55085,113.60788 108.75,110.125 C 108.94915,106.64212 107.97721,102.76613 105.875,99.125 C 103.77291,95.484072 100.89469,92.720612 97.78125,91.15625 C 94.667811,89.591888 91.150225,89.231804 88.25,90.90625 C 87.630617,91.263851 87.641417,91.230359 87.1875,91 C 86.733583,90.769641 85.880559,89.971273 84.84375,88.53125 C 82.770133,85.651204 79.975232,80.428813 75.8125,73.21875 C 75.435989,72.56407 74.722836,72.177275 73.96875,72.21875 C 73.178739,72.268279 72.494718,72.772672 72.21875,73.5 L 70.5,70.75 C 80.43299,52.347791 86.83133,35.391608 93.96875,16.78125 C 94.205146,16.184543 94.329835,15.020174 93.375,14.46875 L 64.3125,60.875 L 35.28125,14.46875 z M 34.78125,98.375 C 35.1163,98.398055 35.384215,98.481147 35.6875,98.65625 C 36.408735,99.072656 36.962348,100.02888 37.03125,101.625 C 37.100152,103.22112 36.619402,105.28826 35.46875,107.28125 C 34.317829,109.27471 32.759661,110.76121 31.34375,111.5 C 29.927839,112.23879 28.846185,112.22887 28.125,111.8125 C 27.40377,111.3961 26.850153,110.47112 26.78125,108.875 C 26.712347,107.27888 27.193102,105.18048 28.34375,103.1875 C 30.21285,99.950123 33.224696,98.267893 34.78125,98.375 z M 94.15625,98.375 C 95.712802,98.267893 98.724654,99.950125 100.59375,103.1875 C 101.7444,105.18048 102.22515,107.27888 102.15625,108.875 C 102.08735,110.47112 101.56498,111.3961 100.84375,111.8125 C 100.12257,112.22887 99.04091,112.23879 97.625,111.5 C 96.20909,110.76121 94.650922,109.27471 93.5,107.28125 C 92.349349,105.28826 91.837348,103.22112 91.90625,101.625 C 91.975152,100.02888 92.528765,99.072656 93.25,98.65625 C 93.553281,98.48115 93.8212,98.398055 94.15625,98.375 z "
|
||||
id="path3483"
|
||||
transform="matrix(1.1279249,0,0,1.1271729,-8.2471649,-11.605871)" />
|
||||
<path
|
||||
sodipodi:nodetypes="cccccsssssssscccsssssssc"
|
||||
id="path4566"
|
||||
d="M 53.65633,70.0625 C 54.51301,70.112586 55.24229,70.703549 55.46883,71.53125 L 57.62508,79.59375 C 57.75179,80.103085 57.67323,80.641816 57.40633,81.09375 L 39.218832,112.5625 C 36.871016,116.62633 33.675899,119.72417 30.218832,121.46875 C 26.761762,123.21333 22.870192,123.61751 19.687582,121.78125 C 16.505022,119.94502 14.908832,116.36699 14.687582,112.5 C 14.466332,108.63301 15.557812,104.31505 17.906332,100.25 C 20.254732,96.185153 23.448062,93.080216 26.906332,91.34375 C 30.364607,89.607284 34.25767,89.2278 37.437582,91.0625 C 38.189793,91.496499 38.265819,91.480641 38.843832,91.1875 C 39.421845,90.894359 40.41398,89.981353 41.593832,88.34375 C 43.95354,85.068543 47.11953,79.185679 51.81258,71.0625 C 52.18909,70.40782 52.90225,70.021025 53.65633,70.0625 z M 30.906332,99.03125 C 28.996249,98.899901 25.550202,100.88292 23.406332,104.59375 C 22.086592,106.8781 21.513602,109.26773 21.593832,111.125 C 21.674062,112.98227 22.342182,114.13243 23.250082,114.65625 C 24.157922,115.18004 25.444492,115.17251 27.093832,114.3125 C 28.743172,113.45249 30.555065,111.75356 31.875082,109.46875 C 33.194831,107.18439 33.767811,104.76352 33.687582,102.90625 C 33.607353,101.04898 32.970479,99.898826 32.062582,99.375 C 31.689306,99.159631 31.322981,99.0599 30.906332,99.03125 z "
|
||||
style="fill:url(#linearGradient4572);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
<path
|
||||
sodipodi:nodetypes="cccscssssccsssscc"
|
||||
id="path4568"
|
||||
d="M 55.65241,70.312928 C 56.57508,70.366873 57.35134,71.011135 57.59533,71.902591 L 57.66599,72.185197 C 57.29393,71.760421 56.80725,71.477828 56.21763,71.443355 C 55.40545,71.398686 54.60957,71.798027 54.20405,72.50313 C 49.14952,81.252005 45.75918,87.592357 43.217718,91.119846 C 41.946986,92.883587 40.872884,93.877473 40.250348,94.193194 C 39.627813,94.508912 39.541489,94.519318 38.731337,94.051891 C 35.306492,92.075871 31.1164,92.499608 27.391742,94.369823 C 23.667082,96.240042 20.241732,99.5652 17.712462,103.94313 L 17.147252,102.8127 C 19.676522,98.434769 23.101862,95.109615 26.826532,93.239397 C 30.551186,91.369181 34.741278,90.945444 38.166123,92.921464 C 38.976275,93.388891 39.062599,93.378485 39.685134,93.062767 C 40.307671,92.747046 41.381773,91.75316 42.652505,89.989419 C 45.19396,86.461931 48.58431,80.121578 53.63884,71.372703 C 54.04436,70.667601 54.84024,70.268259 55.65241,70.312928 z "
|
||||
style="opacity:0.77227723;fill:url(#linearGradient4574);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
<path
|
||||
clip-path="url(#clipPath4455)"
|
||||
style="opacity:0.70297032;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4475)"
|
||||
d="M 75.1875,70.0625 C 74.330819,70.112586 73.601545,70.703549 73.375,71.53125 L 71.21875,79.59375 C 71.09204,80.103085 71.170605,80.641816 71.4375,81.09375 L 89.625,112.5625 C 91.972816,116.62633 95.167933,119.72417 98.625,121.46875 C 102.08207,123.21333 105.97364,123.61751 109.15625,121.78125 C 112.33881,119.94502 113.935,116.36699 114.15625,112.5 C 114.3775,108.63301 113.28602,104.31505 110.9375,100.25 C 108.5891,96.185153 105.39577,93.080216 101.9375,91.34375 C 98.479225,89.607284 94.586162,89.2278 91.40625,91.0625 C 90.654039,91.496499 90.578013,91.480641 90,91.1875 C 89.421987,90.894359 88.429852,89.981353 87.25,88.34375 C 84.890296,85.068543 81.724299,79.185679 77.03125,71.0625 C 76.654739,70.40782 75.941586,70.021025 75.1875,70.0625 z M 97.9375,99.03125 C 99.847583,98.899901 103.29363,100.88292 105.4375,104.59375 C 106.75724,106.8781 107.33023,109.26773 107.25,111.125 C 107.16977,112.98227 106.50165,114.13243 105.59375,114.65625 C 104.68591,115.18004 103.39934,115.17251 101.75,114.3125 C 100.10066,113.45249 98.288767,111.75356 96.96875,109.46875 C 95.649001,107.18439 95.076021,104.76352 95.15625,102.90625 C 95.236479,101.04898 95.873353,99.898826 96.78125,99.375 C 97.154526,99.159631 97.520851,99.0599 97.9375,99.03125 z "
|
||||
id="path4570"
|
||||
sodipodi:nodetypes="cccccsssssssscccsssssssc"
|
||||
transform="matrix(-1,0,0,1,128.84383,0)" />
|
||||
<path
|
||||
style="fill:url(#linearGradient4443);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 75.1875,70.0625 C 74.330819,70.112586 73.601545,70.703549 73.375,71.53125 L 71.21875,79.59375 C 71.09204,80.103085 71.170605,80.641816 71.4375,81.09375 L 89.625,112.5625 C 91.972816,116.62633 95.167933,119.72417 98.625,121.46875 C 102.08207,123.21333 105.97364,123.61751 109.15625,121.78125 C 112.33881,119.94502 113.935,116.36699 114.15625,112.5 C 114.3775,108.63301 113.28602,104.31505 110.9375,100.25 C 108.5891,96.185153 105.39577,93.080216 101.9375,91.34375 C 98.479225,89.607284 94.586162,89.2278 91.40625,91.0625 C 90.654039,91.496499 90.578013,91.480641 90,91.1875 C 89.421987,90.894359 88.429852,89.981353 87.25,88.34375 C 84.890296,85.068543 81.724299,79.185679 77.03125,71.0625 C 76.654739,70.40782 75.941586,70.021025 75.1875,70.0625 z M 97.9375,99.03125 C 99.847583,98.899901 103.29363,100.88292 105.4375,104.59375 C 106.75724,106.8781 107.33023,109.26773 107.25,111.125 C 107.16977,112.98227 106.50165,114.13243 105.59375,114.65625 C 104.68591,115.18004 103.39934,115.17251 101.75,114.3125 C 100.10066,113.45249 98.288767,111.75356 96.96875,109.46875 C 95.649001,107.18439 95.076021,104.76352 95.15625,102.90625 C 95.236479,101.04898 95.873353,99.898826 96.78125,99.375 C 97.154526,99.159631 97.520851,99.0599 97.9375,99.03125 z "
|
||||
id="path3845"
|
||||
sodipodi:nodetypes="cccccsssssssscccsssssssc" />
|
||||
<path
|
||||
style="opacity:0.77227723;fill:url(#linearGradient4494);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 73.191419,70.312928 C 72.268749,70.366873 71.492489,71.011135 71.248498,71.902591 L 71.177846,72.185197 C 71.549903,71.760421 72.036582,71.477828 72.626206,71.443355 C 73.438379,71.398686 74.234264,71.798027 74.639778,72.50313 C 79.694311,81.252005 83.084654,87.592357 85.626114,91.119846 C 86.896846,92.883587 87.970948,93.877473 88.593484,94.193194 C 89.216019,94.508912 89.302343,94.519318 90.112495,94.051891 C 93.53734,92.075871 97.727432,92.499608 101.45209,94.369823 C 105.17675,96.240042 108.6021,99.5652 111.13137,103.94313 L 111.69658,102.8127 C 109.16731,98.434769 105.74197,95.109615 102.0173,93.239397 C 98.292646,91.369181 94.102554,90.945444 90.677709,92.921464 C 89.867557,93.388891 89.781233,93.378485 89.158698,93.062767 C 88.536161,92.747046 87.462059,91.75316 86.191327,89.989419 C 83.649868,86.461931 80.259524,80.121578 75.204992,71.372703 C 74.799477,70.667601 74.003592,70.268259 73.191419,70.312928 z "
|
||||
id="path4479"
|
||||
sodipodi:nodetypes="cccscssssccsssscc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cccccsssssssscccsssssssc"
|
||||
id="path4451"
|
||||
d="M 75.1875,70.0625 C 74.330819,70.112586 73.601545,70.703549 73.375,71.53125 L 71.21875,79.59375 C 71.09204,80.103085 71.170605,80.641816 71.4375,81.09375 L 89.625,112.5625 C 91.972816,116.62633 95.167933,119.72417 98.625,121.46875 C 102.08207,123.21333 105.97364,123.61751 109.15625,121.78125 C 112.33881,119.94502 113.935,116.36699 114.15625,112.5 C 114.3775,108.63301 113.28602,104.31505 110.9375,100.25 C 108.5891,96.185153 105.39577,93.080216 101.9375,91.34375 C 98.479225,89.607284 94.586162,89.2278 91.40625,91.0625 C 90.654039,91.496499 90.578013,91.480641 90,91.1875 C 89.421987,90.894359 88.429852,89.981353 87.25,88.34375 C 84.890296,85.068543 81.724299,79.185679 77.03125,71.0625 C 76.654739,70.40782 75.941586,70.021025 75.1875,70.0625 z M 97.9375,99.03125 C 99.847583,98.899901 103.29363,100.88292 105.4375,104.59375 C 106.75724,106.8781 107.33023,109.26773 107.25,111.125 C 107.16977,112.98227 106.50165,114.13243 105.59375,114.65625 C 104.68591,115.18004 103.39934,115.17251 101.75,114.3125 C 100.10066,113.45249 98.288767,111.75356 96.96875,109.46875 C 95.649001,107.18439 95.076021,104.76352 95.15625,102.90625 C 95.236479,101.04898 95.873353,99.898826 96.78125,99.375 C 97.154526,99.159631 97.520851,99.0599 97.9375,99.03125 z "
|
||||
style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4475);opacity:0.7029703"
|
||||
clip-path="url(#clipPath4455)" />
|
||||
<path
|
||||
style="fill:url(#linearGradient3802);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 97.96087,1.9111929 L 53.629372,72.750318 L 52.479384,84.564291 C 54.445388,81.161344 61.782615,76.320141 67.153838,74.881885 C 81.238527,50.502756 89.411871,28.739567 98.680477,4.5950145 C 98.954672,3.9035524 99.068368,2.5501817 97.96087,1.9111929 z "
|
||||
id="path3506"
|
||||
sodipodi:nodetypes="cccccc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
id="path4269"
|
||||
d="M 97.692496,2.3849918 L 61.738989,59.428222"
|
||||
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
<path
|
||||
style="fill:url(#linearGradient3637);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 59.75 65.65625 L 57.71875 66.21875 L 56.28125 68.5 L 60.59375 77.71875 C 62.419602 76.674902 64.33553 75.770565 66.09375 75.1875 L 59.75 65.65625 z "
|
||||
id="path3629" />
|
||||
<path
|
||||
style="fill:url(#linearGradient4259);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 67.1875 51.0625 L 59 64.15625 L 66.1875 75.15625 C 66.513817 75.049746 66.842006 74.959145 67.15625 74.875 C 69.715966 70.444398 72.069962 66.100297 74.28125 61.8125 L 67.1875 51.0625 z "
|
||||
id="path4248" />
|
||||
<path
|
||||
sodipodi:nodetypes="cccccc"
|
||||
id="path2160"
|
||||
d="M 30.642611,1.9111929 L 74.974109,72.750318 L 76.124096,84.564291 C 74.158093,81.161344 66.820866,76.320141 61.449644,74.881885 C 47.364955,50.502756 39.191609,28.739567 29.923004,4.5950145 C 29.648808,3.9035524 29.535112,2.5501817 30.642611,1.9111929 z "
|
||||
style="fill:url(#linearGradient3617);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
<path
|
||||
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 30.738989,2.3849918 L 64.192496,55.928222"
|
||||
id="path4267"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
transform="matrix(1.4403715,-0.8310572,0.8315989,1.4394331,-75.999063,45.513227)"
|
||||
d="M 68 54 A 2 2 0 1 1 64,54 A 2 2 0 1 1 68 54 z"
|
||||
sodipodi:ry="2"
|
||||
sodipodi:rx="2"
|
||||
sodipodi:cy="54"
|
||||
sodipodi:cx="66"
|
||||
id="path3146"
|
||||
style="opacity:0.96000001;fill:url(#radialGradient4728);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
sodipodi:type="arc" />
|
||||
<image
|
||||
y="0"
|
||||
x="160"
|
||||
id="image4278"
|
||||
height="128"
|
||||
width="128"
|
||||
sodipodi:absref="/home/david/Oxygen/trunk/32x32/actions/edit-copy.png"
|
||||
xlink:href="/home/david/Oxygen/trunk/32x32/actions/edit-copy.png" />
|
||||
<image
|
||||
y="0"
|
||||
x="288"
|
||||
id="image4288"
|
||||
height="128"
|
||||
width="128"
|
||||
sodipodi:absref="/home/david/Oxygen/trunk/32x32/actions/edit-paste.png"
|
||||
xlink:href="/home/david/Oxygen/trunk/32x32/actions/edit-paste.png" />
|
||||
<path
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.70792079;filter:url(#filter4715)"
|
||||
d="M 57.53125 79.25 L 39.71875 110.0625 C 37.370936 114.12633 34.175817 117.22417 30.71875 118.96875 C 27.26168 120.71333 23.37011 121.11751 20.1875 119.28125 C 17.00494 117.44502 15.40875 113.86699 15.1875 110 C 15.119229 108.80676 15.194921 107.57094 15.375 106.3125 C 14.812237 108.42607 14.574653 110.52767 14.6875 112.5 C 14.90875 116.36699 16.50494 119.94502 19.6875 121.78125 C 22.87011 123.61751 26.76168 123.21333 30.21875 121.46875 C 33.675817 119.72417 36.870936 116.62633 39.21875 112.5625 L 57.40625 81.09375 C 57.67315 80.641816 57.75171 80.103085 57.625 79.59375 L 57.53125 79.25 z M 31.40625 96.53125 C 29.496167 96.399901 26.05012 98.38292 23.90625 102.09375 C 22.840787 103.93797 22.266248 105.85407 22.125 107.5 C 22.422918 106.54782 22.850187 105.55624 23.40625 104.59375 C 25.55012 100.88292 28.996167 98.899901 30.90625 99.03125 C 31.322899 99.0599 31.689226 99.159631 32.0625 99.375 C 32.970397 99.898826 33.607273 101.04898 33.6875 102.90625 C 33.703141 103.26833 33.690955 103.66277 33.65625 104.0625 C 34.065399 102.74599 34.233925 101.48097 34.1875 100.40625 C 34.107273 98.54898 33.470397 97.398826 32.5625 96.875 C 32.189226 96.659631 31.822899 96.5599 31.40625 96.53125 z "
|
||||
id="path4576" />
|
||||
<path
|
||||
id="path4609"
|
||||
d="M 57.53125,79.25 L 39.71875,110.0625 C 37.370936,114.12633 34.175817,117.22417 30.71875,118.96875 C 27.26168,120.71333 23.37011,121.11751 20.1875,119.28125 C 17.00494,117.44502 15.40875,113.86699 15.1875,110 C 15.119229,108.80676 15.194921,107.57094 15.375,106.3125 C 14.812237,108.42607 14.574653,110.52767 14.6875,112.5 C 14.90875,116.36699 16.50494,119.94502 19.6875,121.78125 C 22.87011,123.61751 26.76168,123.21333 30.21875,121.46875 C 33.675817,119.72417 36.870936,116.62633 39.21875,112.5625 L 57.40625,81.09375 C 57.67315,80.641816 57.75171,80.103085 57.625,79.59375 L 57.53125,79.25 z M 31.40625,96.53125 C 29.496167,96.399901 26.05012,98.38292 23.90625,102.09375 C 22.840787,103.93797 22.266248,105.85407 22.125,107.5 C 22.422918,106.54782 22.850187,105.55624 23.40625,104.59375 C 25.55012,100.88292 28.996167,98.899901 30.90625,99.03125 C 31.322899,99.0599 31.689226,99.159631 32.0625,99.375 C 32.970397,99.898826 33.607273,101.04898 33.6875,102.90625 C 33.703141,103.26833 33.690955,103.66277 33.65625,104.0625 C 34.065399,102.74599 34.233925,101.48097 34.1875,100.40625 C 34.107273,98.54898 33.470397,97.398826 32.5625,96.875 C 32.189226,96.659631 31.822899,96.5599 31.40625,96.53125 z "
|
||||
style="opacity:0.70792081;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4711)"
|
||||
transform="matrix(-1,0,0,1,128.84431,0)" />
|
||||
<path
|
||||
style="opacity:0.48514851;fill:url(#linearGradient4641);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4691)"
|
||||
d="M 33.1875,106.4375 C 32.888012,107.43505 32.455199,108.46448 31.875,109.46875 C 30.554983,111.75356 28.74309,113.45249 27.09375,114.3125 C 25.44441,115.17251 24.15784,115.18004 23.25,114.65625 C 22.3421,114.13243 21.67398,112.98227 21.59375,111.125 C 21.212006,112.3879 21.048791,113.58424 21.09375,114.625 C 21.17398,116.48227 21.8421,117.63243 22.75,118.15625 C 23.65784,118.68004 24.94441,118.67251 26.59375,117.8125 C 28.24309,116.95249 30.054983,115.25356 31.375,112.96875 C 32.687576,110.6968 33.260229,108.29075 33.1875,106.4375 z "
|
||||
id="path4626"
|
||||
sodipodi:nodetypes="cssscssssc"
|
||||
transform="matrix(1.6395402,0,0,1.5188129,-15.9999,-58.979717)" />
|
||||
<path
|
||||
transform="matrix(-1.6395402,0,0,1.5188129,144.99452,-58.979717)"
|
||||
sodipodi:nodetypes="cssscssssc"
|
||||
id="path4699"
|
||||
d="M 33.1875,106.4375 C 32.888012,107.43505 32.455199,108.46448 31.875,109.46875 C 30.554983,111.75356 28.74309,113.45249 27.09375,114.3125 C 25.44441,115.17251 24.15784,115.18004 23.25,114.65625 C 22.3421,114.13243 21.67398,112.98227 21.59375,111.125 C 21.212006,112.3879 21.048791,113.58424 21.09375,114.625 C 21.17398,116.48227 21.8421,117.63243 22.75,118.15625 C 23.65784,118.68004 24.94441,118.67251 26.59375,117.8125 C 28.24309,116.95249 30.054983,115.25356 31.375,112.96875 C 32.687576,110.6968 33.260229,108.29075 33.1875,106.4375 z "
|
||||
style="opacity:0.48514851;fill:url(#linearGradient4701);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4691)" />
|
||||
<path
|
||||
style="opacity:0.77722772;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 65.770092,66.282577 L 62.183456,70.557029"
|
||||
id="path4730" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 43 KiB |
3302
imgsrc/edit-paste.svg
Normal file
3302
imgsrc/edit-paste.svg
Normal file
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 88 KiB |
722
imgsrc/swap.svg
722
imgsrc/swap.svg
@ -1,722 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://web.resource.org/cc/"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="128"
|
||||
height="128"
|
||||
id="svg2606"
|
||||
sodipodi:version="0.32"
|
||||
inkscape:version="0.45.1"
|
||||
version="1.0"
|
||||
sodipodi:docname="edit-undo.svgz"
|
||||
inkscape:output_extension="org.inkscape.output.svgz.inkscape"
|
||||
sodipodi:docbase="/home/david/oxygen/trunk/scalable/actions"
|
||||
inkscape:export-filename="edit-undo.png"
|
||||
inkscape:export-xdpi="11.25"
|
||||
inkscape:export-ydpi="11.25">
|
||||
<defs
|
||||
id="defs2608">
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient3342">
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3344" />
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop3347" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient3326">
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3328" />
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop3330" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3825">
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:0;"
|
||||
offset="0"
|
||||
id="stop3827" />
|
||||
<stop
|
||||
id="stop3833"
|
||||
offset="0.5"
|
||||
style="stop-color:#ffffff;stop-opacity:0.18705036;" />
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop3829" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3751">
|
||||
<stop
|
||||
style="stop-color:#beba2c;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3753" />
|
||||
<stop
|
||||
style="stop-color:#b6be2c;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop3755" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3528">
|
||||
<stop
|
||||
style="stop-color:#eaf209;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3530" />
|
||||
<stop
|
||||
style="stop-color:#c7c634;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop3532" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3295">
|
||||
<stop
|
||||
style="stop-color:#fffe63;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3297" />
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop3299" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3202">
|
||||
<stop
|
||||
style="stop-color:#fcff9c;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3204" />
|
||||
<stop
|
||||
style="stop-color:#c1a965;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop3206" />
|
||||
</linearGradient>
|
||||
<radialGradient
|
||||
id="XMLID_4_"
|
||||
cx="48"
|
||||
cy="-0.2148"
|
||||
r="55.148"
|
||||
gradientTransform="matrix(0.9792,0,0,0.9725,133.0002,20.8762)"
|
||||
gradientUnits="userSpaceOnUse">
|
||||
<stop
|
||||
offset="0"
|
||||
style="stop-color:#cfd13d;stop-opacity:1;"
|
||||
id="stop3082" />
|
||||
<stop
|
||||
offset="1"
|
||||
style="stop-color:#db8900;stop-opacity:1;"
|
||||
id="stop3090" />
|
||||
</radialGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3260"
|
||||
inkscape:collect="always">
|
||||
<stop
|
||||
id="stop3262"
|
||||
offset="0"
|
||||
style="stop-color:#ffffff;stop-opacity:1;" />
|
||||
<stop
|
||||
id="stop3264"
|
||||
offset="1"
|
||||
style="stop-color:#ffffff;stop-opacity:0;" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3344">
|
||||
<stop
|
||||
id="stop3346"
|
||||
offset="0"
|
||||
style="stop-color:#fdff63;stop-opacity:1;" />
|
||||
<stop
|
||||
id="stop3348"
|
||||
offset="1"
|
||||
style="stop-color:#ffffff;stop-opacity:0;" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3449">
|
||||
<stop
|
||||
id="stop3451"
|
||||
offset="0"
|
||||
style="stop-color:#000000;stop-opacity:1;" />
|
||||
<stop
|
||||
id="stop3453"
|
||||
offset="1"
|
||||
style="stop-color:#000000;stop-opacity:0;" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#XMLID_4_"
|
||||
id="linearGradient3516"
|
||||
x1="147.09375"
|
||||
y1="33.40625"
|
||||
x2="8.083992"
|
||||
y2="123.90625"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#XMLID_4_"
|
||||
id="radialGradient3524"
|
||||
cx="67.09375"
|
||||
cy="116.90625"
|
||||
fx="67.09375"
|
||||
fy="116.90625"
|
||||
r="56"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3528"
|
||||
id="radialGradient3535"
|
||||
cx="99.726295"
|
||||
cy="27.418272"
|
||||
fx="64.689766"
|
||||
fy="68.231934"
|
||||
r="56"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.693735,5.8671246e-2,-3.6242796e-2,0.4285387,33.939389,26.8809)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3295"
|
||||
id="linearGradient3548"
|
||||
x1="75.09375"
|
||||
y1="4.5317035"
|
||||
x2="75.09375"
|
||||
y2="80.172485"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3260"
|
||||
id="linearGradient3581"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(4.2161108e-3,1.9705695e-3)"
|
||||
x1="75.09375"
|
||||
y1="4.5317035"
|
||||
x2="75.09375"
|
||||
y2="80.172485" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3295"
|
||||
id="linearGradient3613"
|
||||
x1="208.59375"
|
||||
y1="130.40625"
|
||||
x2="208.59375"
|
||||
y2="63.426777"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-137,0)" />
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
id="filter3639">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="1.0580524"
|
||||
id="feGaussianBlur3641" />
|
||||
</filter>
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3449"
|
||||
id="radialGradient3654"
|
||||
cx="-10.165252"
|
||||
cy="66.906013"
|
||||
fx="-10.165252"
|
||||
fy="66.906013"
|
||||
r="59.995121"
|
||||
gradientTransform="matrix(0.4582893,-2.1035589e-8,4.5903973e-8,1.0000813,20.447953,-5.1974351e-3)"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3449"
|
||||
id="radialGradient3658"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.2676699,0.521376,-0.7037472,0.3612977,108.99386,-36.062981)"
|
||||
cx="167.67001"
|
||||
cy="80.404922"
|
||||
fx="167.67001"
|
||||
fy="80.404922"
|
||||
r="59.995121" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3260"
|
||||
id="linearGradient3676"
|
||||
x1="120.0625"
|
||||
y1="12.569496"
|
||||
x2="125.30366"
|
||||
y2="14.444496"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
spreadMethod="reflect" />
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
x="-0.15096202"
|
||||
width="1.301924"
|
||||
y="-0.13732364"
|
||||
height="1.2746473"
|
||||
id="filter3738">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="0.39257441"
|
||||
id="feGaussianBlur3740" />
|
||||
</filter>
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3449"
|
||||
id="radialGradient3744"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.982366,1.671718e-2,-3.5801148e-3,0.2103843,-18.56344,30.477792)"
|
||||
cx="72.684891"
|
||||
cy="48.228905"
|
||||
fx="74.871155"
|
||||
fy="26.862719"
|
||||
r="59.995121" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3751"
|
||||
id="radialGradient3757"
|
||||
cx="66.01458"
|
||||
cy="126.69183"
|
||||
fx="66.01458"
|
||||
fy="126.69183"
|
||||
r="59.99512"
|
||||
gradientTransform="matrix(0.675025,0,0,0.3583625,19.527377,41.004647)"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3260"
|
||||
id="radialGradient3767"
|
||||
cx="64.088867"
|
||||
cy="7.4108429"
|
||||
fx="64.088867"
|
||||
fy="7.4108429"
|
||||
r="59.995121"
|
||||
gradientTransform="matrix(0.3093869,0,0,0.4779247,44.260611,3.8644223)"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3344"
|
||||
id="linearGradient3771"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
spreadMethod="reflect"
|
||||
x1="120.0625"
|
||||
y1="12.569496"
|
||||
x2="125.30366"
|
||||
y2="14.444496" />
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
id="filter3438">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="1.3342697"
|
||||
id="feGaussianBlur3440" />
|
||||
</filter>
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
id="filter3630">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="0.89883985"
|
||||
id="feGaussianBlur3632" />
|
||||
</filter>
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3825"
|
||||
id="radialGradient2361"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.6484284,0.1017206,-3.1257154e-2,0.1992521,-4.56257,53.15916)"
|
||||
cx="-112.17241"
|
||||
cy="118.60459"
|
||||
fx="-113.14772"
|
||||
fy="59.708473"
|
||||
r="59.99512" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3326"
|
||||
id="linearGradient2363"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-151.43935"
|
||||
y1="37.68198"
|
||||
x2="-152.26776"
|
||||
y2="57.25" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3326"
|
||||
id="linearGradient2365"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-132.51041"
|
||||
y1="39.803303"
|
||||
x2="-158.92462"
|
||||
y2="72.881729" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3326"
|
||||
id="linearGradient2367"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-83.012932"
|
||||
y1="44.753052"
|
||||
x2="-158.92462"
|
||||
y2="72.881729" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3342"
|
||||
id="linearGradient3349"
|
||||
x1="-73"
|
||||
y1="105.625"
|
||||
x2="-163"
|
||||
y2="86.125"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<filter
|
||||
inkscape:collect="always"
|
||||
x="-0.087741371"
|
||||
width="1.1754827"
|
||||
y="-0.10211017"
|
||||
height="1.2042203"
|
||||
id="filter3363">
|
||||
<feGaussianBlur
|
||||
inkscape:collect="always"
|
||||
stdDeviation="3.0526685"
|
||||
id="feGaussianBlur3365" />
|
||||
</filter>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3342"
|
||||
id="linearGradient3372"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-40.5,-1.5)"
|
||||
x1="-83.593941"
|
||||
y1="137.13324"
|
||||
x2="-138.0043"
|
||||
y2="92.603989" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3342"
|
||||
id="linearGradient3376"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-40.5,-1.5)"
|
||||
x1="-61.802711"
|
||||
y1="99.979607"
|
||||
x2="-136.51074"
|
||||
y2="112.70422" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3825"
|
||||
id="radialGradient3388"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.6484284,0.1017206,-3.1257154e-2,0.1992521,-4.56257,53.15916)"
|
||||
cx="-112.17241"
|
||||
cy="118.60459"
|
||||
fx="-113.14772"
|
||||
fy="59.708473"
|
||||
r="59.99512" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3326"
|
||||
id="linearGradient3390"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-151.43935"
|
||||
y1="37.68198"
|
||||
x2="-152.26776"
|
||||
y2="57.25" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3326"
|
||||
id="linearGradient3392"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-132.51041"
|
||||
y1="39.803303"
|
||||
x2="-158.92462"
|
||||
y2="72.881729" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3326"
|
||||
id="linearGradient3394"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-83.012932"
|
||||
y1="44.753052"
|
||||
x2="-158.92462"
|
||||
y2="72.881729" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3342"
|
||||
id="linearGradient3396"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-73"
|
||||
y1="105.625"
|
||||
x2="-163"
|
||||
y2="86.125" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3342"
|
||||
id="linearGradient3398"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-40.5,-1.5)"
|
||||
x1="-83.593941"
|
||||
y1="137.13324"
|
||||
x2="-138.0043"
|
||||
y2="92.603989" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3342"
|
||||
id="linearGradient3400"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-40.5,-1.5)"
|
||||
x1="-61.802711"
|
||||
y1="99.979607"
|
||||
x2="-136.51074"
|
||||
y2="112.70422" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3825"
|
||||
id="radialGradient3422"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.6484284,0.1017206,-3.1257154e-2,0.1992521,-4.56257,53.15916)"
|
||||
cx="-112.17241"
|
||||
cy="118.60459"
|
||||
fx="-113.14772"
|
||||
fy="59.708473"
|
||||
r="59.99512" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3326"
|
||||
id="linearGradient3424"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-151.43935"
|
||||
y1="37.68198"
|
||||
x2="-152.26776"
|
||||
y2="57.25" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3326"
|
||||
id="linearGradient3426"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-132.51041"
|
||||
y1="39.803303"
|
||||
x2="-158.92462"
|
||||
y2="72.881729" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3326"
|
||||
id="linearGradient3428"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-83.012932"
|
||||
y1="44.753052"
|
||||
x2="-158.92462"
|
||||
y2="72.881729" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3342"
|
||||
id="linearGradient3430"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-73"
|
||||
y1="105.625"
|
||||
x2="-163"
|
||||
y2="86.125" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3342"
|
||||
id="linearGradient3432"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-40.5,-1.5)"
|
||||
x1="-83.593941"
|
||||
y1="137.13324"
|
||||
x2="-138.0043"
|
||||
y2="92.603989" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3342"
|
||||
id="linearGradient3434"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-40.5,-1.5)"
|
||||
x1="-61.802711"
|
||||
y1="99.979607"
|
||||
x2="-136.51074"
|
||||
y2="112.70422" />
|
||||
<mask
|
||||
maskUnits="userSpaceOnUse"
|
||||
id="mask3402">
|
||||
<g
|
||||
id="g3404"
|
||||
transform="translate(167.50257,-3.755156e-3)">
|
||||
<g
|
||||
id="g3406"
|
||||
transform="translate(80.51637,30.885255)">
|
||||
<path
|
||||
style="opacity:1;fill:url(#radialGradient3422);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:1.08779998;stroke-opacity:1"
|
||||
d="M -184.42232,-32.47243 C -217.54751,-32.47243 -248.42232,-0.097625 -248.42232,33.02757 C -248.42232,66.15276 -217.04751,97.02757 -183.92232,97.02757 C -153.6332,97.02757 -128.58571,70.81131 -124.51607,41.68382 L -159.54732,36.65257 C -161.172,48.6137 -171.47739,57.62132 -183.92232,57.62132 C -197.49395,57.62132 -206.01607,46.0992 -206.01607,32.52757 C -206.01607,18.955936 -199.99395,12.43382 -186.42232,12.43382 C -179.6365,12.433819 -176.50103,10.198864 -172.04732,14.65257 L -176.8745,25.979749 C -178.93037,28.035619 -179.11822,29.285529 -178.55411,30.595278 C -178.04554,31.776057 -177.03338,33.12132 -174.34438,33.12132 L -130.39107,33.12132 C -126.54518,33.12132 -123.93208,30.466941 -123.93208,26.871189 L -124.00095,-17.206829 C -124.00095,-19.687584 -124.90346,-21.050058 -126.18242,-21.556444 C -127.49674,-22.076829 -129.21563,-21.679122 -131.28951,-19.605244 L -141.48482,-19.40993 C -152.34417,-30.269281 -167.85972,-32.47243 -184.42232,-32.47243 z "
|
||||
id="path3408"
|
||||
sodipodi:nodetypes="cssccsssccsccccsccc" />
|
||||
<path
|
||||
sodipodi:nodetypes="ccccc"
|
||||
style="fill:url(#linearGradient3424);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3438)"
|
||||
d="M -161.5,34.5 C -162,37 -180,54 -180,54 L -132.5,80 L -112,38.5 L -161.5,34.5 z "
|
||||
id="path3410" />
|
||||
<path
|
||||
sodipodi:nodetypes="ccccc"
|
||||
id="path3412"
|
||||
d="M -161.5,34.5 C -162,37 -181.27817,54.389087 -181.27817,54.389087 L -151.62742,97.591883 L -112,38.5 L -161.5,34.5 z "
|
||||
style="fill:url(#linearGradient3426);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3438)" />
|
||||
<path
|
||||
style="fill:url(#linearGradient3428);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3438)"
|
||||
d="M -161.5,34.5 C -162,37 -181.27817,54.389087 -181.27817,54.389087 L -151.62742,97.591883 L -112,38.5 L -161.5,34.5 z "
|
||||
id="path3414"
|
||||
sodipodi:nodetypes="ccccc" />
|
||||
</g>
|
||||
<rect
|
||||
y="69.75"
|
||||
x="-119"
|
||||
height="71.75"
|
||||
width="83.5"
|
||||
id="rect3416"
|
||||
style="opacity:1;fill:url(#linearGradient3430);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.08779998;stroke-opacity:1;filter:url(#filter3363)" />
|
||||
<path
|
||||
sodipodi:nodetypes="ccccc"
|
||||
id="path3418"
|
||||
d="M -159.5,68.25 L -39.138259,55.983708 L -93.453327,162.55286 L -197.79465,128.96507 L -159.5,68.25 z "
|
||||
style="fill:url(#linearGradient3432);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:1.08779998;stroke-opacity:1;filter:url(#filter3363)"
|
||||
transform="matrix(0.6393762,0.7688941,-0.7688941,0.6393762,37.597642,128.08723)" />
|
||||
<path
|
||||
transform="matrix(0.6393762,0.7688941,-0.7688941,0.6393762,37.597642,128.08723)"
|
||||
style="fill:url(#linearGradient3434);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:1.08779998;stroke-opacity:1;filter:url(#filter3363)"
|
||||
d="M -159.5,68.25 L -39.138259,55.983708 L -93.453327,162.55286 L -197.79465,128.96507 L -159.5,68.25 z "
|
||||
id="path3420"
|
||||
sodipodi:nodetypes="ccccc" />
|
||||
</g>
|
||||
</mask>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3751"
|
||||
id="linearGradient3565"
|
||||
x1="-267.47665"
|
||||
y1="18.103027"
|
||||
x2="-33.476654"
|
||||
y2="18.103027"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3295"
|
||||
id="linearGradient3567"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-137,0)"
|
||||
x1="208.59375"
|
||||
y1="130.40625"
|
||||
x2="208.59375"
|
||||
y2="63.426777" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="4.6484375"
|
||||
inkscape:cx="64"
|
||||
inkscape:cy="64"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
width="128px"
|
||||
height="128px"
|
||||
gridspacingx="4px"
|
||||
gridspacingy="4px"
|
||||
gridempspacing="2"
|
||||
showgrid="false"
|
||||
inkscape:grid-points="true"
|
||||
showguides="true"
|
||||
inkscape:guide-bbox="true"
|
||||
inkscape:window-width="748"
|
||||
inkscape:window-height="681"
|
||||
inkscape:window-x="526"
|
||||
inkscape:window-y="51" />
|
||||
<metadata
|
||||
id="metadata2611">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Livello 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1">
|
||||
<g
|
||||
id="g3835"
|
||||
mask="url(#mask3402)"
|
||||
transform="matrix(-1,0,0,1,128.17774,0)">
|
||||
<path
|
||||
sodipodi:nodetypes="cssccsssccsccccsccc"
|
||||
id="rect3204"
|
||||
d="M 64.09375,3.90625 C 30.968558,3.9062499 4.0937499,30.781055 4.09375,63.90625 C 4.0937501,97.031442 30.96856,123.90625 64.09375,123.90625 C 94.382866,123.90625 119.43036,101.68999 123.5,72.5625 L 88.46875,67.53125 C 86.844066,79.492379 76.538676,88.5 64.09375,88.5 C 50.522122,88.499999 39.5,77.477881 39.5,63.90625 C 39.500001,50.334616 50.522119,39.3125 64.09375,39.3125 C 70.879568,39.312499 77.015044,42.077544 81.46875,46.53125 L 71.141571,56.858429 C 69.085701,58.914299 68.897846,60.164209 69.461963,61.473958 C 69.970531,62.654737 70.982695,64 73.671688,64 L 117.625,64 C 121.47089,64 124.08399,61.345621 124.08399,57.749869 L 124.01512,13.671851 C 124.01512,11.191096 123.11261,9.8286218 121.83365,9.3222363 C 120.51933,8.8018514 118.80044,9.1995576 116.72656,11.273436 L 106.53125,21.46875 C 95.671902,10.609399 80.656349,3.90625 64.09375,3.90625 z "
|
||||
style="opacity:1;fill:url(#linearGradient3516);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:1.08779998;stroke-opacity:1" />
|
||||
<path
|
||||
style="opacity:0.79775277;fill:url(#radialGradient3757);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:1.08779998;stroke-opacity:1"
|
||||
d="M 64.09375,3.90625 C 30.968558,3.9062499 4.0937499,30.781055 4.09375,63.90625 C 4.0937501,97.031442 30.96856,123.90625 64.09375,123.90625 C 94.382866,123.90625 119.43036,101.68999 123.5,72.5625 L 88.46875,67.53125 C 86.844066,79.492379 76.538676,88.5 64.09375,88.5 C 50.522122,88.499999 39.5,77.477881 39.5,63.90625 C 39.500001,50.334616 50.522119,39.3125 64.09375,39.3125 C 70.879568,39.312499 77.015044,42.077544 81.46875,46.53125 L 71.141571,56.858429 C 69.085701,58.914299 68.897846,60.164209 69.461963,61.473958 C 69.970531,62.654737 70.982695,64 73.671688,64 L 117.625,64 C 121.47089,64 124.08399,61.345621 124.08399,57.749869 L 124.01512,13.671851 C 124.01512,11.191096 123.11261,9.8286218 121.83365,9.3222363 C 120.51933,8.8018514 118.80044,9.1995576 116.72656,11.273436 L 106.53125,21.46875 C 95.671902,10.609399 80.656349,3.90625 64.09375,3.90625 z "
|
||||
id="path3749"
|
||||
sodipodi:nodetypes="cssccsssccsccccsccc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cssccsssccsccccsccc"
|
||||
id="path3656"
|
||||
d="M 64.09375,3.90625 C 30.968558,3.9062499 4.0937499,30.781055 4.09375,63.90625 C 4.0937501,97.031442 30.96856,123.90625 64.09375,123.90625 C 94.382866,123.90625 119.43036,101.68999 123.5,72.5625 L 88.46875,67.53125 C 86.844066,79.492379 76.538676,88.5 64.09375,88.5 C 50.522122,88.499999 39.5,77.477881 39.5,63.90625 C 39.500001,50.334616 50.522119,39.3125 64.09375,39.3125 C 70.879568,39.312499 77.015044,42.077544 81.46875,46.53125 L 71.141571,56.858429 C 69.085701,58.914299 68.897846,60.164209 69.461963,61.473958 C 69.970531,62.654737 70.982695,64 73.671688,64 L 117.625,64 C 121.47089,64 124.08399,61.345621 124.08399,57.749869 L 124.01512,13.671851 C 124.01512,11.191096 123.11261,9.8286218 121.83365,9.3222363 C 120.51933,8.8018514 118.80044,9.1995576 116.72656,11.273436 L 106.53125,21.46875 C 95.671902,10.609399 80.656349,3.90625 64.09375,3.90625 z "
|
||||
style="opacity:0.68913861;fill:url(#radialGradient3658);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:1.08779998;stroke-opacity:1" />
|
||||
<path
|
||||
style="opacity:1;fill:url(#radialGradient3654);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:1.08779998;stroke-opacity:1"
|
||||
d="M 64.09375,3.90625 C 30.968558,3.9062499 4.0937499,30.781055 4.09375,63.90625 C 4.0937501,97.031442 30.96856,123.90625 64.09375,123.90625 C 94.382866,123.90625 119.43036,101.68999 123.5,72.5625 L 88.46875,67.53125 C 86.844066,79.492379 76.538676,88.5 64.09375,88.5 C 50.522122,88.499999 39.5,77.477881 39.5,63.90625 C 39.500001,50.334616 50.522119,39.3125 64.09375,39.3125 C 70.879568,39.312499 77.015044,42.077544 81.46875,46.53125 L 71.141571,56.858429 C 69.085701,58.914299 68.897846,60.164209 69.461963,61.473958 C 69.970531,62.654737 70.982695,64 73.671688,64 L 117.625,64 C 121.47089,64 124.08399,61.345621 124.08399,57.749869 L 124.01512,13.671851 C 124.01512,11.191096 123.11261,9.8286218 121.83365,9.3222363 C 120.51933,8.8018514 118.80044,9.1995576 116.72656,11.273436 L 106.53125,21.46875 C 95.671902,10.609399 80.656349,3.90625 64.09375,3.90625 z "
|
||||
id="path3643"
|
||||
sodipodi:nodetypes="cssccsssccsccccsccc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cssccsssccsccccsccc"
|
||||
id="path3742"
|
||||
d="M 64.09375,3.90625 C 30.968558,3.9062499 4.0937499,30.781055 4.09375,63.90625 C 4.0937501,97.031442 30.96856,123.90625 64.09375,123.90625 C 94.382866,123.90625 119.43036,101.68999 123.5,72.5625 L 88.46875,67.53125 C 86.844066,79.492379 76.538676,88.5 64.09375,88.5 C 50.522122,88.499999 39.5,77.477881 39.5,63.90625 C 39.500001,50.334616 50.522119,39.3125 64.09375,39.3125 C 70.879568,39.312499 77.015044,42.077544 81.46875,46.53125 L 71.141571,56.858429 C 69.085701,58.914299 68.897846,60.164209 69.461963,61.473958 C 69.970531,62.654737 70.982695,64 73.671688,64 L 117.625,64 C 121.47089,64 124.08399,61.345621 124.08399,57.749869 L 124.01512,13.671851 C 124.01512,11.191096 123.11261,9.8286218 121.83365,9.3222363 C 120.51933,8.8018514 118.80044,9.1995576 116.72656,11.273436 L 106.53125,21.46875 C 95.671902,10.609399 80.656349,3.90625 64.09375,3.90625 z "
|
||||
style="opacity:0.79775277;fill:url(#radialGradient3744);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:1.08779998;stroke-opacity:1" />
|
||||
<path
|
||||
style="opacity:0.74531836;fill:url(#radialGradient3767);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:1.08779998;stroke-opacity:1;filter:url(#filter3630)"
|
||||
d="M 64.09375,4.20625 C 30.968558,4.2062499 4.0937499,30.781055 4.09375,63.90625 C 4.0937501,97.031442 30.96856,123.90625 64.09375,123.90625 C 94.382866,123.90625 119.43036,101.68999 123.5,72.5625 L 88.46875,67.53125 C 86.844066,79.492379 76.538676,88.5 64.09375,88.5 C 50.522122,88.499999 39.5,77.477881 39.5,63.90625 C 39.500001,50.334616 50.522119,39.3125 64.09375,39.3125 C 70.879568,39.312499 77.015044,42.077544 81.46875,46.53125 L 71.141571,56.858429 C 69.085701,58.914299 68.897846,60.164209 69.461963,61.473958 C 69.970531,62.654737 70.982695,64 73.671688,64 L 117.625,64 C 121.47089,64 124.08399,61.345621 124.08399,57.749869 L 124.01512,13.671851 C 124.01512,11.191096 123.11261,9.8286218 121.83365,9.3222363 C 120.51933,8.8018514 118.80044,9.1995576 116.72656,11.273436 L 106.53125,21.46875 C 95.671902,10.609399 80.656349,4.20625 64.09375,4.20625 z "
|
||||
id="path3759"
|
||||
sodipodi:nodetypes="cssccsssccsccccsccc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cccczc"
|
||||
id="path3660"
|
||||
d="M 117.6875,10.75 L 118.625,15.125 L 119.875,16 L 123.875,13.375 C 124.12188,11.651249 123.52383,10.027571 121.9375,9.3749999 C 120.35116,8.7224285 118.77622,9.5017032 117.6875,10.75 z "
|
||||
style="opacity:0.82022472;fill:url(#linearGradient3676);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3738)" />
|
||||
<path
|
||||
transform="matrix(0,1,1,0,60.363582,-60.363586)"
|
||||
style="opacity:0.82022472;fill:url(#linearGradient3771);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3738)"
|
||||
d="M 117.6875,10.75 L 119.875,13.875 L 120.375,13.75 L 123.875,13.375 C 124.12188,11.651249 123.52383,10.027571 121.9375,9.3749999 C 120.35116,8.7224285 118.77622,9.5017032 117.6875,10.75 z "
|
||||
id="path3769"
|
||||
sodipodi:nodetypes="cccczc" />
|
||||
<path
|
||||
id="path3494"
|
||||
d="M 64.09375,7.90625 C 33.132052,7.9062499 8.0937499,32.944549 8.09375,63.90625 C 8.0937501,94.867948 33.132054,119.90625 64.09375,119.90625 C 91.026646,119.90625 113.21548,101.0995 118.625,75.90625 L 91.5,72.03125 C 88.061436,83.928551 77.059621,92.5 64.09375,92.5 C 48.356404,92.499999 35.5,79.643599 35.5,63.90625 C 35.500001,48.168899 48.356402,35.3125 64.09375,35.3125 C 71.966166,35.312499 79.145304,38.520304 84.3125,43.6875 C 85.071964,44.438909 85.499997,45.462886 85.5,46.53125 C 85.5,47.599614 85.071964,48.623591 84.3125,49.375 L 73.6875,60 L 117.625,60 C 119.63039,60 120.09375,59.407836 120.09375,57.75 L 120,13.65625 L 109.375,24.3125 C 108.62359,25.071964 107.59961,25.5 106.53125,25.5 C 105.46289,25.5 104.43891,25.071964 103.6875,24.3125 C 93.549835,14.174833 79.577106,7.90625 64.09375,7.90625 z "
|
||||
style="opacity:1;fill:url(#radialGradient3524);fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.08779998;stroke-opacity:1" />
|
||||
<path
|
||||
style="opacity:1;fill:url(#radialGradient3535);fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.08779998;stroke-opacity:1"
|
||||
d="M 64.09375,7.90625 C 33.132052,7.9062499 8.0937499,32.944549 8.09375,63.90625 C 8.0937501,94.867948 33.132054,119.90625 64.09375,119.90625 C 91.026646,119.90625 113.21548,101.0995 118.625,75.90625 L 91.5,72.03125 C 88.061436,83.928551 77.059621,92.5 64.09375,92.5 C 48.356404,92.499999 35.5,79.643599 35.5,63.90625 C 35.500001,48.168899 48.356402,35.3125 64.09375,35.3125 C 71.966166,35.312499 79.145304,38.520304 84.3125,43.6875 C 85.071964,44.438909 85.499997,45.462886 85.5,46.53125 C 85.5,47.599614 85.071964,48.623591 84.3125,49.375 L 73.6875,60 L 117.625,60 C 119.63039,60 120.09375,59.407836 120.09375,57.75 L 120,13.65625 L 109.375,24.3125 C 108.62359,25.071964 107.59961,25.5 106.53125,25.5 C 105.46289,25.5 104.43891,25.071964 103.6875,24.3125 C 93.549835,14.174833 79.577106,7.90625 64.09375,7.90625 z "
|
||||
id="path3526" />
|
||||
<path
|
||||
sodipodi:nodetypes="csccssccccccscc"
|
||||
id="path3537"
|
||||
d="M 64.09375,7.90625 C 33.132052,7.9062499 8.0937499,32.944549 8.09375,63.90625 C 8.09375,64.474122 8.1082724,65.029981 8.125,65.59375 C 14.11447,66.271402 20.266218,66.74388 26.53125,67 C 26.260548,56.540958 30.202859,46.025084 38.34375,38.21875 C 53.683067,23.509813 78.072313,24.004431 92.78125,39.34375 C 95.545099,42.226046 97.537852,45.032117 99.34375,48.59375 L 78.84375,59 L 98,59 C 105.9282,56.973373 113.18621,55.563033 120.09375,52.8125 L 120,13.65625 L 109.375,24.3125 C 108.62359,25.071964 107.59961,25.5 106.53125,25.5 C 105.46289,25.5 104.43891,25.071964 103.6875,24.3125 C 93.549835,14.174833 79.577106,7.90625 64.09375,7.90625 z "
|
||||
style="opacity:1;fill:url(#linearGradient3548);fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.08779998;stroke-opacity:1" />
|
||||
<path
|
||||
sodipodi:nodetypes="cscscscccccccccccssssssccscscc"
|
||||
id="path3553"
|
||||
d="M 64.099866,7.9087646 C 33.138176,7.9087644 8.0998661,32.947063 8.0998661,63.908764 C 8.0998761,64.087476 8.0973761,64.263059 8.0998661,64.440014 C 8.3531061,33.696509 33.295846,8.9087645 64.099866,8.9087646 C 79.583236,8.9087645 93.555946,15.177347 103.69361,25.315014 C 104.44503,26.074479 105.469,26.502514 106.53736,26.502514 C 107.60573,26.502515 108.6297,26.074478 109.38111,25.315014 L 119.50611,15.158764 L 119.99986,52.708764 C 113.09232,55.459294 105.43431,56.569624 97.506116,58.596264 L 78.849866,59.002514 L 98.006116,59.002514 C 105.93431,56.975884 113.19232,55.565544 120.09986,52.815014 L 120.00611,14.658764 L 120.00611,13.658764 L 119.50611,14.158764 L 109.38111,24.315014 C 108.62971,25.074479 107.60572,25.502514 106.53736,25.502514 C 105.46901,25.502515 104.44502,25.074478 103.69361,24.315014 C 103.68314,24.304548 103.67283,24.294222 103.66236,24.283764 C 103.60999,24.231473 103.55869,24.179598 103.50611,24.127514 C 102.93231,23.559643 102.35524,23.012364 101.75611,22.471264 C 101.67459,22.397145 101.58807,22.326157 101.50611,22.252514 C 91.590066,13.342335 78.496526,7.9087646 64.099866,7.9087646 z M 63.443616,27.127514 C 54.205446,27.378034 45.040176,30.920194 37.849866,37.815014 C 30.217786,45.133448 26.722316,55.187931 26.537366,65.033764 C 26.777246,55.231884 30.717786,45.539698 38.349866,38.221264 C 51.665996,25.452364 71.803196,24.123207 86.506116,34.033764 C 79.627056,29.22869 71.518656,26.908534 63.443616,27.127514 z "
|
||||
style="opacity:1;fill:url(#linearGradient3581);fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.08779998;stroke-opacity:1" />
|
||||
<path
|
||||
id="path3603"
|
||||
d="M 63.59375,7.90625 C 32.63205,7.9062499 7.59375,32.944549 7.59375,63.90625 C 7.59375,94.867948 32.63205,119.90625 63.59375,119.90625 C 90.52665,119.90625 112.71548,101.0995 118.125,75.90625 L 91,72.03125 C 87.56144,83.928551 76.55962,92.5 63.59375,92.5 C 47.8564,92.499999 35,79.643599 35,63.90625 C 35,48.168899 47.8564,35.3125 63.59375,35.3125 C 71.46617,35.312499 78.6453,38.520304 83.8125,43.6875 C 84.57196,44.438909 85,45.462886 85,46.53125 C 85,47.599614 84.57196,48.623591 83.8125,49.375 L 73.1875,60 L 117.125,60 C 119.13039,60 119.59375,59.407836 119.59375,57.75 L 119.5,13.65625 L 108.875,24.3125 C 108.12359,25.071964 107.09961,25.5 106.03125,25.5 C 104.96289,25.5 103.93891,25.071964 103.1875,24.3125 C 93.04984,14.174833 79.07711,7.90625 63.59375,7.90625 z "
|
||||
style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient3567);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.08779998;stroke-opacity:1;filter:url(#filter3639)" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 35 KiB |
@ -41,6 +41,20 @@ series_index_auto_increment = 'next'
|
||||
# selecting 'manage authors', and pressing 'Recalculate all author sort values'.
|
||||
author_sort_copy_method = 'invert'
|
||||
|
||||
# Set which author field to display in the tags pane (the list of authors,
|
||||
# series, publishers etc on the left hand side). The choices are author and
|
||||
# author_sort. This tweak affects only what is displayed under the authors
|
||||
# category in the tags pane and content server. Please note that if you set this
|
||||
# to author_sort, it is very possible to see duplicate names in the list because
|
||||
# although it is guaranteed that author names are unique, there is no such
|
||||
# guarantee for author_sort values. Showing duplicates won't break anything, but
|
||||
# it could lead to some confusion. When using 'author_sort', the tooltip will
|
||||
# show the author's name.
|
||||
# Examples:
|
||||
# categories_use_field_for_author_name = 'author'
|
||||
# categories_use_field_for_author_name = 'author_sort'
|
||||
categories_use_field_for_author_name = 'author'
|
||||
|
||||
|
||||
# Set whether boolean custom columns are two- or three-valued.
|
||||
# Two-values for true booleans
|
||||
|
||||
BIN
resources/images/devices/bambook.png
Normal file
BIN
resources/images/devices/bambook.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
BIN
resources/images/edit-cut.png
Normal file
BIN
resources/images/edit-cut.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
BIN
resources/images/edit-paste.png
Normal file
BIN
resources/images/edit-paste.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
BIN
resources/images/edit-redo.png
Normal file
BIN
resources/images/edit-redo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
BIN
resources/images/edit-select-all.png
Normal file
BIN
resources/images/edit-select-all.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
BIN
resources/images/edit-undo.png
Normal file
BIN
resources/images/edit-undo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
BIN
resources/images/format-fill-color.png
Normal file
BIN
resources/images/format-fill-color.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
BIN
resources/images/format-indent-less.png
Normal file
BIN
resources/images/format-indent-less.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
resources/images/format-indent-more.png
Normal file
BIN
resources/images/format-indent-more.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
BIN
resources/images/format-justify-center.png
Normal file
BIN
resources/images/format-justify-center.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
BIN
resources/images/format-justify-fill.png
Normal file
BIN
resources/images/format-justify-fill.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1021 B |
BIN
resources/images/format-justify-left.png
Normal file
BIN
resources/images/format-justify-left.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
resources/images/format-justify-right.png
Normal file
BIN
resources/images/format-justify-right.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
resources/images/format-list-ordered.png
Normal file
BIN
resources/images/format-list-ordered.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.1 KiB |
BIN
resources/images/format-list-unordered.png
Normal file
BIN
resources/images/format-list-unordered.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
BIN
resources/images/format-text-color.png
Normal file
BIN
resources/images/format-text-color.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.0 KiB |
BIN
resources/images/format-text-heading.png
Normal file
BIN
resources/images/format-text-heading.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 965 B |
BIN
resources/images/format-text-subscript.png
Normal file
BIN
resources/images/format-text-subscript.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.2 KiB |
BIN
resources/images/format-text-superscript.png
Normal file
BIN
resources/images/format-text-superscript.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.1 KiB |
BIN
resources/images/insert-link.png
Normal file
BIN
resources/images/insert-link.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 11 KiB |
@ -1,64 +1,102 @@
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
|
||||
__copyright__ = '2008 Kovid Goyal kovid@kovidgoyal.net, 2010 Darko Miletic <darko.miletic at gmail.com>'
|
||||
'''
|
||||
http://www.businessweek.com/magazine/news/articles/business_news.htm
|
||||
www.businessweek.com
|
||||
'''
|
||||
|
||||
from calibre import strftime
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
|
||||
class BWmagazine(BasicNewsRecipe):
|
||||
title = 'BusinessWeek Magazine'
|
||||
__author__ = 'Darko Miletic'
|
||||
description = 'Stay up to date with BusinessWeek magazine articles. Read news on international business, personal finances & the economy in the BusinessWeek online magazine.'
|
||||
class BusinessWeek(BasicNewsRecipe):
|
||||
title = 'Business Week'
|
||||
__author__ = 'Kovid Goyal and Darko Miletic'
|
||||
description = 'Read the latest international business news & stock market news. Get updated company profiles, financial advice, global economy and technology news.'
|
||||
publisher = 'Bloomberg L.P.'
|
||||
category = 'news, International Business News, current news in international business,international business articles, personal business, business week magazine, business week magazine articles, business week magazine online, business week online magazine'
|
||||
oldest_article = 10
|
||||
max_articles_per_feed = 100
|
||||
category = 'Business, business news, stock market, stock market news, financial advice, company profiles, financial advice, global economy, technology news'
|
||||
oldest_article = 7
|
||||
max_articles_per_feed = 200
|
||||
no_stylesheets = True
|
||||
encoding = 'utf-8'
|
||||
encoding = 'utf8'
|
||||
use_embedded_content = False
|
||||
language = 'en'
|
||||
INDEX = 'http://www.businessweek.com/magazine/news/articles/business_news.htm'
|
||||
remove_empty_feeds = True
|
||||
publication_type = 'magazine'
|
||||
cover_url = 'http://images.businessweek.com/mz/covers/current_120x160.jpg'
|
||||
|
||||
masthead_url = 'http://assets.businessweek.com/images/bw-logo.png'
|
||||
extra_css = """
|
||||
body{font-family: Helvetica,Arial,sans-serif }
|
||||
img{margin-bottom: 0.4em; display:block}
|
||||
.tagline{color: gray; font-style: italic}
|
||||
.photoCredit{font-size: small; color: gray}
|
||||
"""
|
||||
|
||||
conversion_options = {
|
||||
'comment' : description
|
||||
, 'tags' : category
|
||||
, 'publisher' : publisher
|
||||
, 'language' : language
|
||||
'comment' : description
|
||||
, 'tags' : category
|
||||
, 'publisher' : publisher
|
||||
, 'language' : language
|
||||
}
|
||||
|
||||
remove_tags = [
|
||||
dict(attrs={'class':'inStory'})
|
||||
,dict(name=['meta','link','iframe','base','embed','object','table','th','tr','td'])
|
||||
,dict(attrs={'id':['inset','videoDisplay']})
|
||||
]
|
||||
keep_only_tags = [dict(name='div', attrs={'id':['story-body','storyBody']})]
|
||||
remove_attributes = ['lang']
|
||||
match_regexps = [r'http://www.businessweek.com/.*_page_[1-9].*']
|
||||
|
||||
def parse_index(self):
|
||||
articles = []
|
||||
soup = self.index_to_soup(self.INDEX)
|
||||
ditem = soup.find('div',attrs={'id':'column2'})
|
||||
if ditem:
|
||||
for item in ditem.findAll('h3'):
|
||||
title_prefix = ''
|
||||
description = ''
|
||||
feed_link = item.find('a')
|
||||
if feed_link and feed_link.has_key('href'):
|
||||
url = 'http://www.businessweek.com/magazine/' + feed_link['href'].partition('../../')[2]
|
||||
title = title_prefix + self.tag_to_string(feed_link)
|
||||
date = strftime(self.timefmt)
|
||||
articles.append({
|
||||
'title' :title
|
||||
,'date' :date
|
||||
,'url' :url
|
||||
,'description':description
|
||||
})
|
||||
return [(soup.head.title.string, articles)]
|
||||
|
||||
keep_only_tags = dict(name='div', attrs={'id':'storyBody'})
|
||||
feeds = [
|
||||
(u'Top Stories', u'http://www.businessweek.com/topStories/rss/topStories.rss'),
|
||||
(u'Top News' , u'http://www.businessweek.com/rss/bwdaily.rss' ),
|
||||
(u'Asia', u'http://www.businessweek.com/rss/asia.rss'),
|
||||
(u'Autos', u'http://www.businessweek.com/rss/autos/index.rss'),
|
||||
(u'Classic Cars', u'http://rss.businessweek.com/bw_rss/classiccars'),
|
||||
(u'Hybrids', u'http://rss.businessweek.com/bw_rss/hybrids'),
|
||||
(u'Europe', u'http://www.businessweek.com/rss/europe.rss'),
|
||||
(u'Auto Reviews', u'http://rss.businessweek.com/bw_rss/autoreviews'),
|
||||
(u'Innovation & Design', u'http://www.businessweek.com/rss/innovate.rss'),
|
||||
(u'Architecture', u'http://www.businessweek.com/rss/architecture.rss'),
|
||||
(u'Brand Equity', u'http://www.businessweek.com/rss/brandequity.rss'),
|
||||
(u'Auto Design', u'http://www.businessweek.com/rss/carbuff.rss'),
|
||||
(u'Game Room', u'http://rss.businessweek.com/bw_rss/gameroom'),
|
||||
(u'Technology', u'http://www.businessweek.com/rss/technology.rss'),
|
||||
(u'Investing', u'http://rss.businessweek.com/bw_rss/investor'),
|
||||
(u'Small Business', u'http://www.businessweek.com/rss/smallbiz.rss'),
|
||||
(u'Careers', u'http://rss.businessweek.com/bw_rss/careers'),
|
||||
(u'B-Schools', u'http://www.businessweek.com/rss/bschools.rss'),
|
||||
(u'Magazine Selections', u'http://www.businessweek.com/rss/magazine.rss'),
|
||||
(u'CEO Guide to Tech', u'http://www.businessweek.com/rss/ceo_guide_tech.rss'),
|
||||
]
|
||||
|
||||
def get_article_url(self, article):
|
||||
url = article.get('guid', None)
|
||||
if 'podcasts' in url:
|
||||
return None
|
||||
if 'surveys' in url:
|
||||
return None
|
||||
if 'images' in url:
|
||||
return None
|
||||
if 'feedroom' in url:
|
||||
return None
|
||||
if '/magazine/toc/' in url:
|
||||
return None
|
||||
rurl, sep, rest = url.rpartition('?')
|
||||
if rurl:
|
||||
return rurl
|
||||
return rest
|
||||
|
||||
def print_version(self, url):
|
||||
rurl = url.rpartition('?')[0]
|
||||
if rurl == '':
|
||||
rurl = url
|
||||
return rurl.replace('.com/magazine/','.com/print/magazine/')
|
||||
|
||||
if '/news/' in url or '/blog/ in url':
|
||||
return url
|
||||
rurl = url.replace('http://www.businessweek.com/','http://www.businessweek.com/print/')
|
||||
return rurl.replace('/investing/','/investor/')
|
||||
|
||||
def preprocess_html(self, soup):
|
||||
for item in soup.findAll(style=True):
|
||||
del item['style']
|
||||
for alink in soup.findAll('a'):
|
||||
if alink.string is not None:
|
||||
tstr = alink.string
|
||||
alink.replaceWith(tstr)
|
||||
return soup
|
||||
|
||||
67
resources/recipes/cnd.recipe
Normal file
67
resources/recipes/cnd.recipe
Normal file
@ -0,0 +1,67 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2010, Derek Liang <Derek.liang.ca @@@at@@@ gmail.com>'
|
||||
'''
|
||||
cnd.org
|
||||
'''
|
||||
import re
|
||||
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
|
||||
class TheCND(BasicNewsRecipe):
|
||||
|
||||
title = 'CND'
|
||||
__author__ = 'Derek Liang'
|
||||
description = ''
|
||||
INDEX = 'http://cnd.org'
|
||||
language = 'zh'
|
||||
conversion_options = {'linearize_tables':True}
|
||||
|
||||
remove_tags_before = dict(name='div', id='articleHead')
|
||||
remove_tags_after = dict(id='copyright')
|
||||
remove_tags = [dict(name='table', attrs={'align':'right'}), dict(name='img', attrs={'src':'http://my.cnd.org/images/logo.gif'}), dict(name='hr', attrs={}), dict(name='small', attrs={})]
|
||||
no_stylesheets = True
|
||||
|
||||
preprocess_regexps = [(re.compile(r'<!--.*?-->', re.DOTALL), lambda m: '')]
|
||||
|
||||
def print_version(self, url):
|
||||
if url.find('news/article.php') >= 0:
|
||||
return re.sub("^[^=]*", "http://my.cnd.org/modules/news/print.php?storyid", url)
|
||||
else:
|
||||
return re.sub("^[^=]*", "http://my.cnd.org/modules/wfsection/print.php?articleid", url)
|
||||
|
||||
def parse_index(self):
|
||||
soup = self.index_to_soup(self.INDEX)
|
||||
|
||||
feeds = []
|
||||
articles = {}
|
||||
|
||||
for a in soup.findAll('a', attrs={'target':'_cnd'}):
|
||||
url = a['href']
|
||||
if url.find('article.php') < 0 :
|
||||
continue
|
||||
if url.startswith('/'):
|
||||
url = 'http://cnd.org'+url
|
||||
title = self.tag_to_string(a)
|
||||
self.log('\tFound article: ', title, 'at', url)
|
||||
date = a.nextSibling
|
||||
if (date is not None) and len(date)>2:
|
||||
if not articles.has_key(date):
|
||||
articles[date] = []
|
||||
articles[date].append({'title':title, 'url':url, 'description': '', 'date':''})
|
||||
self.log('\t\tAppend to : ', date)
|
||||
|
||||
self.log('log articles', articles)
|
||||
mostCurrent = sorted(articles).pop()
|
||||
self.title = 'CND ' + mostCurrent
|
||||
|
||||
feeds.append((self.title, articles[mostCurrent]))
|
||||
|
||||
return feeds
|
||||
|
||||
def populate_article_metadata(self, article, soup, first):
|
||||
header = soup.find('h3')
|
||||
self.log('header: ' + self.tag_to_string(header))
|
||||
pass
|
||||
|
||||
42
resources/recipes/ecotrend.recipe
Normal file
42
resources/recipes/ecotrend.recipe
Normal file
@ -0,0 +1,42 @@
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
|
||||
'''
|
||||
globaleconomicanalysis.blogspot.com
|
||||
'''
|
||||
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
|
||||
class GlobalEconomicAnalysis(BasicNewsRecipe):
|
||||
title = "Mish's Global Economic Trend Analysis"
|
||||
__author__ = 'Darko Miletic'
|
||||
description = 'Thoughts on the global economy, housing, gold, silver, interest rates, oil, energy, China, commodities, the dollar, Euro, Renminbi, Yen, inflation, deflation, stagflation, precious metals, emerging markets, and policy decisions that affect the global markets.'
|
||||
publisher = 'Mike Shedlock'
|
||||
category = 'news, politics, economy, banking'
|
||||
oldest_article = 7
|
||||
max_articles_per_feed = 200
|
||||
no_stylesheets = True
|
||||
encoding = 'utf8'
|
||||
use_embedded_content = True
|
||||
language = 'en'
|
||||
remove_empty_feeds = True
|
||||
publication_type = 'blog'
|
||||
masthead_url = 'http://www.pagina12.com.ar/commons/imgs/logo-home.gif'
|
||||
extra_css = """
|
||||
body{font-family: Arial,Helvetica,sans-serif }
|
||||
img{margin-bottom: 0.4em; display:block}
|
||||
"""
|
||||
|
||||
conversion_options = {
|
||||
'comment' : description
|
||||
, 'tags' : category
|
||||
, 'publisher' : publisher
|
||||
, 'language' : language
|
||||
}
|
||||
|
||||
remove_tags = [
|
||||
dict(name=['meta','link','iframe','object','embed'])
|
||||
,dict(attrs={'class':'blogger-post-footer'})
|
||||
]
|
||||
remove_attributes=['border']
|
||||
|
||||
feeds = [(u'Articles', u'http://feeds2.feedburner.com/MishsGlobalEconomicTrendAnalysis')]
|
||||
@ -40,13 +40,12 @@ class GazetvanAntwerpen(BasicNewsRecipe):
|
||||
remove_tags_after = dict(name='span', attrs={'class':'author'})
|
||||
|
||||
feeds = [
|
||||
(u'Overzicht & Blikvanger', u'http://www.gva.be/syndicationservices/artfeedservice.svc/rss/overview/overzicht' )
|
||||
(u'Binnenland' , u'http://www.gva.be/syndicationservices/artfeedservice.svc/rss/mostrecent/binnenland' )
|
||||
,(u'Buitenland' , u'http://www.gva.be/syndicationservices/artfeedservice.svc/rss/mostrecent/buitenland' )
|
||||
,(u'Stad & Regio' , u'http://www.gva.be/syndicationservices/artfeedservice.svc/rss/mostrecent/stadenregio' )
|
||||
,(u'Economie' , u'http://www.gva.be/syndicationservices/artfeedservice.svc/rss/mostrecent/economie' )
|
||||
,(u'Binnenland' , u'http://www.gva.be/syndicationservices/artfeedservice.svc/rss/mostrecent/binnenland' )
|
||||
,(u'Buitenland' , u'http://www.gva.be/syndicationservices/artfeedservice.svc/rss/mostrecent/buitenland' )
|
||||
,(u'Media & Cultur' , u'http://www.gva.be/syndicationservices/artfeedservice.svc/rss/mostrecent/mediaencultuur')
|
||||
,(u'Wetenschap' , u'http://www.gva.be/syndicationservices/artfeedservice.svc/rss/mostrecent/mediaencultuur')
|
||||
,(u'Wetenschap' , u'http://www.gva.be/syndicationservices/artfeedservice.svc/rss/mostrecent/wetenschap' )
|
||||
,(u'Sport' , u'http://www.gva.be/syndicationservices/artfeedservice.svc/rss/mostrecent/sport' )
|
||||
]
|
||||
|
||||
|
||||
@ -1,88 +1,72 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import re
|
||||
from calibre.web.feeds.recipes import BasicNewsRecipe
|
||||
|
||||
class JournalofHospitalMedicine(BasicNewsRecipe):
|
||||
|
||||
title = 'Journal of Hospital Medicine'
|
||||
__author__ = 'Krittika Goyal'
|
||||
__author__ = 'Kovid Goyal'
|
||||
description = 'Medical news'
|
||||
timefmt = ' [%d %b, %Y]'
|
||||
needs_subscription = True
|
||||
language = 'en'
|
||||
|
||||
no_stylesheets = True
|
||||
#remove_tags_before = dict(name='div', attrs={'align':'center'})
|
||||
#remove_tags_after = dict(name='ol', attrs={'compact':'COMPACT'})
|
||||
remove_tags = [
|
||||
dict(name='iframe'),
|
||||
dict(name='div', attrs={'class':'subContent'}),
|
||||
dict(name='div', attrs={'id':['contentFrame']}),
|
||||
#dict(name='form', attrs={'onsubmit':"return verifySearch(this.w,'Keyword, citation, or author')"}),
|
||||
#dict(name='table', attrs={'align':'RIGHT'}),
|
||||
]
|
||||
|
||||
keep_only_tags = [dict(id=['articleTitle', 'articleMeta', 'fulltext'])]
|
||||
remove_tags = [dict(attrs={'class':'licensedContent'})]
|
||||
|
||||
|
||||
# TO LOGIN
|
||||
def get_browser(self):
|
||||
br = BasicNewsRecipe.get_browser()
|
||||
br.open('http://www3.interscience.wiley.com/cgi-bin/home')
|
||||
br.select_form(name='siteLogin')
|
||||
br['LoginName'] = self.username
|
||||
br['Password'] = self.password
|
||||
br.select_form(nr=0)
|
||||
br['j_username'] = self.username
|
||||
br['j_password'] = self.password
|
||||
response = br.submit()
|
||||
raw = response.read()
|
||||
if 'userName = ""' in raw:
|
||||
if '<h2>LOGGED IN</h2>' not in raw:
|
||||
raise Exception('Login failed. Check your username and password')
|
||||
return br
|
||||
|
||||
#TO GET ARTICLE TOC
|
||||
def johm_get_index(self):
|
||||
return self.index_to_soup('http://www3.interscience.wiley.com/journal/111081937/home')
|
||||
return self.index_to_soup('http://onlinelibrary.wiley.com/journal/10.1002/(ISSN)1553-5606/currentissue')
|
||||
|
||||
# To parse artice toc
|
||||
def parse_index(self):
|
||||
parse_soup = self.johm_get_index()
|
||||
soup = self.johm_get_index()
|
||||
toc = soup.find(id='issueTocGroups')
|
||||
feeds = []
|
||||
for group in toc.findAll('li', id=re.compile(r'group\d+')):
|
||||
gtitle = group.find(attrs={'class':'subSectionHeading'})
|
||||
if gtitle is None:
|
||||
continue
|
||||
gtitle = self.tag_to_string(gtitle)
|
||||
arts = group.find(attrs={'class':'articles'})
|
||||
if arts is None:
|
||||
continue
|
||||
self.log('Found section:', gtitle)
|
||||
articles = []
|
||||
for art in arts.findAll(attrs={'class':lambda x: x and 'tocArticle'
|
||||
in x}):
|
||||
a = art.find('a', href=True)
|
||||
if a is None:
|
||||
continue
|
||||
url = a.get('href')
|
||||
if url.startswith('/'):
|
||||
url = 'http://onlinelibrary.wiley.com' + url
|
||||
url = url.replace('/abstract', '/full')
|
||||
title = self.tag_to_string(a)
|
||||
a.extract()
|
||||
pm = art.find(attrs={'class':'productMenu'})
|
||||
if pm is not None:
|
||||
pm.extract()
|
||||
desc = self.tag_to_string(art)
|
||||
self.log('\tFound article:', title, 'at', url)
|
||||
articles.append({'title':title, 'url':url, 'description':desc,
|
||||
'date':''})
|
||||
if articles:
|
||||
feeds.append((gtitle, articles))
|
||||
|
||||
div = parse_soup.find(id='contentCell')
|
||||
|
||||
current_section = None
|
||||
current_articles = []
|
||||
feeds = []
|
||||
for x in div.findAll(True):
|
||||
if x.name == 'h4':
|
||||
# Section heading found
|
||||
if current_articles and current_section:
|
||||
feeds.append((current_section, current_articles))
|
||||
current_section = self.tag_to_string(x)
|
||||
current_articles = []
|
||||
self.log('\tFound section:', current_section)
|
||||
if current_section is not None and x.name == 'strong':
|
||||
title = self.tag_to_string(x)
|
||||
p = x.parent.parent.find('a', href=lambda x: x and '/HTMLSTART' in x)
|
||||
if p is None:
|
||||
continue
|
||||
url = p.get('href', False)
|
||||
if not url or not title:
|
||||
continue
|
||||
if url.startswith('/'):
|
||||
url = 'http://www3.interscience.wiley.com'+url
|
||||
url = url.replace('/HTMLSTART', '/main.html,ftx_abs')
|
||||
self.log('\t\tFound article:', title)
|
||||
self.log('\t\t\t', url)
|
||||
#if url.startswith('/'):
|
||||
#url = 'http://online.wsj.com'+url
|
||||
current_articles.append({'title': title, 'url':url,
|
||||
'description':'', 'date':''})
|
||||
|
||||
if current_articles and current_section:
|
||||
feeds.append((current_section, current_articles))
|
||||
|
||||
return feeds
|
||||
|
||||
def preprocess_html(self, soup):
|
||||
for img in soup.findAll('img', src=True):
|
||||
img['src'] = img['src'].replace('tfig', 'nfig')
|
||||
return soup
|
||||
return feeds
|
||||
|
||||
|
||||
@ -78,4 +78,6 @@ class Lanacion(BasicNewsRecipe):
|
||||
]
|
||||
|
||||
def preprocess_html(self, soup):
|
||||
for item in soup.findAll(style=True):
|
||||
del item['style']
|
||||
return self.adeify_images(soup)
|
||||
|
||||
@ -4,7 +4,7 @@ from calibre.web.feeds.recipes import BasicNewsRecipe
|
||||
class LeMonde(BasicNewsRecipe):
|
||||
title = 'Le Monde'
|
||||
__author__ = 'veezh'
|
||||
description = 'Actualités'
|
||||
description = u'Actualit\xe9s'
|
||||
oldest_article = 1
|
||||
max_articles_per_feed = 100
|
||||
no_stylesheets = True
|
||||
|
||||
@ -4,23 +4,14 @@ from calibre.web.feeds.recipes import BasicNewsRecipe
|
||||
class NYTimes(BasicNewsRecipe):
|
||||
|
||||
title = 'New England Journal of Medicine'
|
||||
__author__ = 'Krittika Goyal'
|
||||
__author__ = 'Kovid Goyal'
|
||||
description = 'Medical news'
|
||||
timefmt = ' [%d %b, %Y]'
|
||||
needs_subscription = True
|
||||
language = 'en'
|
||||
|
||||
no_stylesheets = True
|
||||
remove_tags_before = dict(name='div', attrs={'align':'center'})
|
||||
remove_tags_after = dict(name='ol', attrs={'compact':'COMPACT'})
|
||||
remove_tags = [
|
||||
dict(name='iframe'),
|
||||
#dict(name='div', attrs={'class':'related-articles'}),
|
||||
dict(name='div', attrs={'id':['sidebar']}),
|
||||
#dict(name='form', attrs={'onsubmit':"return verifySearch(this.w,'Keyword, citation, or author')"}),
|
||||
dict(name='table', attrs={'align':'RIGHT'}),
|
||||
]
|
||||
|
||||
keep_only_tags = dict(id='content')
|
||||
|
||||
|
||||
#TO LOGIN
|
||||
@ -38,61 +29,50 @@ class NYTimes(BasicNewsRecipe):
|
||||
|
||||
#TO GET ARTICLE TOC
|
||||
def nejm_get_index(self):
|
||||
return self.index_to_soup('http://content.nejm.org/current.dtl')
|
||||
return self.index_to_soup('http://content.nejm.org/current.dtl')
|
||||
|
||||
# To parse artice toc
|
||||
def parse_index(self):
|
||||
parse_soup = self.nejm_get_index()
|
||||
parse_soup = self.nejm_get_index()
|
||||
|
||||
div = parse_soup.find(id='centerTOC')
|
||||
feeds = []
|
||||
|
||||
current_section = None
|
||||
current_articles = []
|
||||
feeds = []
|
||||
for x in div.findAll(True):
|
||||
if x.name == 'img' and '/toc/' in x.get('src', '') and 'uarrow.gif' not in x.get('src', ''):
|
||||
# Section heading found
|
||||
if current_articles and current_section and 'Week in the' not in current_section:
|
||||
feeds.append((current_section, current_articles))
|
||||
current_section = x.get('alt')
|
||||
current_articles = []
|
||||
self.log('\tFound section:', current_section)
|
||||
if current_section is not None and x.name == 'strong':
|
||||
title = self.tag_to_string(x)
|
||||
a = x.parent.find('a', href=lambda x: x and '/full/' in x)
|
||||
if a is None:
|
||||
continue
|
||||
url = a.get('href', False)
|
||||
if not url or not title:
|
||||
continue
|
||||
if url.startswith('/'):
|
||||
url = 'http://content.nejm.org'+url
|
||||
self.log('\t\tFound article:', title)
|
||||
self.log('\t\t\t', url)
|
||||
if url.startswith('/'):
|
||||
url = 'http://online.wsj.com'+url
|
||||
current_articles.append({'title': title, 'url':url,
|
||||
'description':'', 'date':''})
|
||||
|
||||
if current_articles and current_section:
|
||||
feeds.append((current_section, current_articles))
|
||||
|
||||
return feeds
|
||||
|
||||
def preprocess_html(self, soup):
|
||||
for a in soup.findAll(text=lambda x: x and '[in this window]' in x):
|
||||
a = a.findParent('a')
|
||||
url = a.get('href', None)
|
||||
if not url:
|
||||
div = parse_soup.find(attrs={'class':'tocContent'})
|
||||
for group in div.findAll(attrs={'class':'articleGrouping'}):
|
||||
feed_title = group.find(attrs={'class':'articleType'})
|
||||
if feed_title is None:
|
||||
continue
|
||||
if url.startswith('/'):
|
||||
url = 'http://content.nejm.org'+url
|
||||
isoup = self.index_to_soup(url)
|
||||
img = isoup.find('img', src=lambda x: x and
|
||||
x.startswith('/content/'))
|
||||
if img is not None:
|
||||
img.extract()
|
||||
table = a.findParent('table')
|
||||
table.replaceWith(img)
|
||||
return soup
|
||||
feed_title = self.tag_to_string(feed_title)
|
||||
articles = []
|
||||
self.log('Found section:', feed_title)
|
||||
for art in group.findAll(attrs={'class':lambda x: x and 'articleEntry'
|
||||
in x}):
|
||||
link = art.find(attrs={'class':lambda x:x and 'articleLink' in
|
||||
x})
|
||||
if link is None:
|
||||
continue
|
||||
a = link.find('a', href=True)
|
||||
if a is None:
|
||||
continue
|
||||
url = a.get('href')
|
||||
if url.startswith('/'):
|
||||
url = 'http://www.nejm.org'+url
|
||||
title = self.tag_to_string(a)
|
||||
self.log.info('\tFound article:', title, 'at', url)
|
||||
article = {'title':title, 'url':url, 'date':''}
|
||||
au = art.find(attrs={'class':'articleAuthors'})
|
||||
if au is not None:
|
||||
article['author'] = self.tag_to_string(au)
|
||||
desc = art.find(attrs={'class':'hover_text'})
|
||||
if desc is not None:
|
||||
desc = self.tag_to_string(desc)
|
||||
if 'author' in article:
|
||||
desc = ' by ' + article['author'] + ' ' +desc
|
||||
article['description'] = desc
|
||||
articles.append(article)
|
||||
if articles:
|
||||
feeds.append((feed_title, articles))
|
||||
|
||||
return feeds
|
||||
|
||||
|
||||
|
||||
58
resources/recipes/nrc-nl-epub.recipe
Normal file
58
resources/recipes/nrc-nl-epub.recipe
Normal file
@ -0,0 +1,58 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
#Based on Lars Jacob's Taz Digiabo recipe
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2010, veezh'
|
||||
|
||||
'''
|
||||
www.nrc.nl
|
||||
'''
|
||||
import os, urllib2, zipfile
|
||||
import time
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
from calibre.ptempfile import PersistentTemporaryFile
|
||||
|
||||
|
||||
class NRCHandelsblad(BasicNewsRecipe):
|
||||
|
||||
title = u'NRC Handelsblad'
|
||||
description = u'De EPUB-versie van NRC'
|
||||
language = 'nl'
|
||||
lang = 'nl-NL'
|
||||
|
||||
__author__ = 'veezh'
|
||||
|
||||
conversion_options = {
|
||||
'no_default_epub_cover' : True
|
||||
}
|
||||
|
||||
def build_index(self):
|
||||
today = time.strftime("%Y%m%d")
|
||||
domain = "http://digitaleeditie.nrc.nl"
|
||||
|
||||
url = domain + "/digitaleeditie/helekrant/epub/nrc_" + today + ".epub"
|
||||
# print url
|
||||
|
||||
try:
|
||||
f = urllib2.urlopen(url)
|
||||
except urllib2.HTTPError:
|
||||
self.report_progress(0,_('Kan niet inloggen om editie te downloaden'))
|
||||
raise ValueError('Krant van vandaag nog niet beschikbaar')
|
||||
|
||||
tmp = PersistentTemporaryFile(suffix='.epub')
|
||||
self.report_progress(0,_('downloading epub'))
|
||||
tmp.write(f.read())
|
||||
tmp.close()
|
||||
|
||||
zfile = zipfile.ZipFile(tmp.name, 'r')
|
||||
self.report_progress(0,_('extracting epub'))
|
||||
|
||||
zfile.extractall(self.output_dir)
|
||||
|
||||
tmp.close()
|
||||
index = os.path.join(self.output_dir, 'content.opf')
|
||||
|
||||
self.report_progress(1,_('epub downloaded and extracted'))
|
||||
|
||||
return index
|
||||
62
resources/recipes/wenxuecity-znjy.recipe
Normal file
62
resources/recipes/wenxuecity-znjy.recipe
Normal file
@ -0,0 +1,62 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2010, Derek Liang <Derek.liang.ca @@@at@@@ gmail.com>'
|
||||
'''
|
||||
wenxuecity.com
|
||||
'''
|
||||
import re
|
||||
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
|
||||
class TheCND(BasicNewsRecipe):
|
||||
|
||||
title = 'wenxuecity - znjy'
|
||||
__author__ = 'Derek Liang'
|
||||
description = ''
|
||||
INDEX = 'http://bbs.wenxuecity.com/znjy/?elite=1'
|
||||
language = 'zh'
|
||||
conversion_options = {'linearize_tables':True}
|
||||
|
||||
remove_tags_before = dict(name='div', id='message')
|
||||
remove_tags_after = dict(name='div', id='message')
|
||||
remove_tags = [dict(name='div', id='postmeta'), dict(name='div', id='footer')]
|
||||
no_stylesheets = True
|
||||
|
||||
preprocess_regexps = [(re.compile(r'<!--.*?-->', re.DOTALL), lambda m: '')]
|
||||
|
||||
def print_version(self, url):
|
||||
return url + '?print'
|
||||
|
||||
def parse_index(self):
|
||||
soup = self.index_to_soup(self.INDEX)
|
||||
|
||||
feeds = []
|
||||
articles = {}
|
||||
|
||||
for a in soup.findAll('a', attrs={'class':'post'}):
|
||||
url = a['href']
|
||||
if url.startswith('/'):
|
||||
url = 'http://bbs.wenxuecity.com'+url
|
||||
title = self.tag_to_string(a)
|
||||
self.log('\tFound article: ', title, ' at:', url)
|
||||
dateReg = re.search( '(\d\d?)/(\d\d?)/(\d\d)', self.tag_to_string(a.parent) )
|
||||
date = '%(y)s/%(m)02d/%(d)02d' % {'y' : dateReg.group(3), 'm' : int(dateReg.group(1)), 'd' : int(dateReg.group(2)) }
|
||||
if not articles.has_key(date):
|
||||
articles[date] = []
|
||||
articles[date].append({'title':title, 'url':url, 'description': '', 'date':''})
|
||||
self.log('\t\tAppend to : ', date)
|
||||
|
||||
self.log('log articles', articles)
|
||||
mostCurrent = sorted(articles).pop()
|
||||
self.title = '文学城 - 子女教育 - ' + mostCurrent
|
||||
|
||||
feeds.append((self.title, articles[mostCurrent]))
|
||||
|
||||
return feeds
|
||||
|
||||
def populate_article_metadata(self, article, soup, first):
|
||||
header = soup.find('h3')
|
||||
self.log('header: ' + self.tag_to_string(header))
|
||||
pass
|
||||
|
||||
@ -46,7 +46,7 @@ class WallStreetJournal(BasicNewsRecipe):
|
||||
br = BasicNewsRecipe.get_browser()
|
||||
if self.username is not None and self.password is not None:
|
||||
br.open('http://commerce.wsj.com/auth/login')
|
||||
br.select_form(nr=0)
|
||||
br.select_form(nr=1)
|
||||
br['user'] = self.username
|
||||
br['password'] = self.password
|
||||
res = br.submit()
|
||||
|
||||
@ -318,7 +318,11 @@ class LinuxFreeze(Command):
|
||||
import codecs
|
||||
|
||||
def set_default_encoding():
|
||||
locale.setlocale(locale.LC_ALL, '')
|
||||
try:
|
||||
locale.setlocale(locale.LC_ALL, '')
|
||||
except:
|
||||
print 'WARNING: Failed to set default libc locale, using en_US.UTF-8'
|
||||
locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
|
||||
enc = locale.getdefaultlocale()[1]
|
||||
if not enc:
|
||||
enc = locale.nl_langinfo(locale.CODESET)
|
||||
|
||||
@ -36,6 +36,16 @@ Install BeautifulSoup 3.0.x manually into site-packages (3.1.x parses broken HTM
|
||||
|
||||
Install pywin32 and edit win32com\__init__.py setting _frozen = True and
|
||||
__gen_path__ to a temp dir (otherwise it tries to set it to a dir in the install tree which leads to permission errors)
|
||||
Note that you should use::
|
||||
|
||||
import tempfile
|
||||
__gen_path__ = os.path.join(
|
||||
tempfile.gettempdir(), "gen_py",
|
||||
"%d.%d" % (sys.version_info[0], sys.version_info[1]))
|
||||
|
||||
Use gettempdir instead of the win32 api method as gettempdir returns a temp dir that is guaranteed to actually work.
|
||||
|
||||
|
||||
Also edit win32com\client\gencache.py and change the except IOError on line 57 to catch all exceptions.
|
||||
|
||||
SQLite
|
||||
|
||||
@ -474,12 +474,14 @@ from calibre.devices.binatone.driver import README
|
||||
from calibre.devices.hanvon.driver import N516, EB511, ALEX, AZBOOKA, THEBOOK
|
||||
from calibre.devices.edge.driver import EDGE
|
||||
from calibre.devices.teclast.driver import TECLAST_K3, NEWSMY, IPAPYRUS, \
|
||||
SOVOS, PICO
|
||||
SOVOS, PICO, SUNSTECH_EB700
|
||||
from calibre.devices.sne.driver import SNE
|
||||
from calibre.devices.misc import PALMPRE, AVANT, SWEEX, PDNOVEL, KOGAN, \
|
||||
GEMEI, VELOCITYMICRO, PDNOVEL_KOBO, Q600, LUMIREAD
|
||||
GEMEI, VELOCITYMICRO, PDNOVEL_KOBO, Q600, LUMIREAD, ALURATEK_COLOR, \
|
||||
TREKSTOR
|
||||
from calibre.devices.folder_device.driver import FOLDER_DEVICE_FOR_CONFIG
|
||||
from calibre.devices.kobo.driver import KOBO
|
||||
from calibre.devices.bambook.driver import BAMBOOK
|
||||
|
||||
from calibre.ebooks.metadata.fetch import GoogleBooks, ISBNDB, Amazon, \
|
||||
LibraryThing
|
||||
@ -579,7 +581,7 @@ plugins += [
|
||||
ELONEX,
|
||||
TECLAST_K3,
|
||||
NEWSMY,
|
||||
PICO,
|
||||
PICO, SUNSTECH_EB700,
|
||||
IPAPYRUS,
|
||||
SOVOS,
|
||||
EDGE,
|
||||
@ -600,6 +602,9 @@ plugins += [
|
||||
VELOCITYMICRO,
|
||||
PDNOVEL_KOBO,
|
||||
LUMIREAD,
|
||||
ALURATEK_COLOR,
|
||||
BAMBOOK,
|
||||
TREKSTOR,
|
||||
ITUNES,
|
||||
]
|
||||
plugins += [x for x in list(locals().values()) if isinstance(x, type) and \
|
||||
|
||||
@ -696,8 +696,9 @@ class BambookOutput(OutputProfile):
|
||||
short_name = 'bambook'
|
||||
description = _('This profile is intended for the Sanda Bambook.')
|
||||
|
||||
# Screen size is a best guess
|
||||
screen_size = (600, 800)
|
||||
# Screen size is for full screen display
|
||||
screen_size = (580, 780)
|
||||
# Comic size is for normal display
|
||||
comic_screen_size = (540, 700)
|
||||
dpi = 168.451
|
||||
fbase = 12
|
||||
|
||||
@ -24,11 +24,11 @@ class ANDROID(USBMS):
|
||||
0xc92 : [0x100], 0xc97: [0x226]},
|
||||
|
||||
# Eken
|
||||
0x040d : { 0x8510 : [0x0001] },
|
||||
0x040d : { 0x8510 : [0x0001], 0x0851 : [0x1] },
|
||||
|
||||
# Motorola
|
||||
0x22b8 : { 0x41d9 : [0x216], 0x2d67 : [0x100], 0x41db : [0x216],
|
||||
0x4285 : [0x216]},
|
||||
0x4285 : [0x216], 0x42a3 : [0x216] },
|
||||
|
||||
# Sony Ericsson
|
||||
0xfce : { 0xd12e : [0x0100]},
|
||||
@ -49,8 +49,9 @@ class ANDROID(USBMS):
|
||||
# Dell
|
||||
0x413c : { 0xb007 : [0x0100, 0x0224]},
|
||||
|
||||
# Eken?
|
||||
0x040d : { 0x0851 : [0x0001]},
|
||||
# LG
|
||||
0x1004 : { 0x61cc : [0x100] },
|
||||
|
||||
}
|
||||
EBOOK_DIR_MAIN = ['eBooks/import', 'wordplayer/calibretransfer', 'Books']
|
||||
EXTRA_CUSTOMIZATION_MESSAGE = _('Comma separated list of directories to '
|
||||
@ -59,13 +60,13 @@ class ANDROID(USBMS):
|
||||
EXTRA_CUSTOMIZATION_DEFAULT = ', '.join(EBOOK_DIR_MAIN)
|
||||
|
||||
VENDOR_NAME = ['HTC', 'MOTOROLA', 'GOOGLE_', 'ANDROID', 'ACER',
|
||||
'GT-I5700', 'SAMSUNG', 'DELL', 'LINUX']
|
||||
'GT-I5700', 'SAMSUNG', 'DELL', 'LINUX', 'GOOGLE']
|
||||
WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'INC.NEXUS_ONE',
|
||||
'__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD', 'SGH-I897',
|
||||
'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID',
|
||||
'SCH-I500_CARD', 'SPH-D700_CARD', 'MB810']
|
||||
'SCH-I500_CARD', 'SPH-D700_CARD', 'MB810', 'GT-P1000']
|
||||
WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897',
|
||||
'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID']
|
||||
'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD']
|
||||
|
||||
OSX_MAIN_MEM = 'HTC Android Phone Media'
|
||||
|
||||
|
||||
0
src/calibre/devices/bambook/__init__.py
Normal file
0
src/calibre/devices/bambook/__init__.py
Normal file
477
src/calibre/devices/bambook/driver.py
Normal file
477
src/calibre/devices/bambook/driver.py
Normal file
@ -0,0 +1,477 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2010, Li Fanxi <lifanxi at freemindworld.com>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
'''
|
||||
Device driver for Sanda's Bambook
|
||||
'''
|
||||
|
||||
import time, os, hashlib
|
||||
from itertools import cycle
|
||||
from calibre.devices.interface import DevicePlugin
|
||||
from calibre.devices.usbms.deviceconfig import DeviceConfig
|
||||
from calibre.devices.bambook.libbambookcore import Bambook, text_encoding, CONN_CONNECTED, is_bambook_lib_ready
|
||||
from calibre.devices.usbms.books import Book, BookList
|
||||
from calibre.ebooks.metadata.book.json_codec import JsonCodec
|
||||
from calibre.ptempfile import TemporaryDirectory, TemporaryFile
|
||||
from calibre.constants import __appname__, __version__
|
||||
from calibre.devices.errors import OpenFeedback
|
||||
|
||||
class BAMBOOK(DeviceConfig, DevicePlugin):
|
||||
name = 'Bambook Device Interface'
|
||||
description = _('Communicate with the Sanda Bambook eBook reader.')
|
||||
author = _('Li Fanxi')
|
||||
supported_platforms = ['windows', 'linux', 'osx']
|
||||
log_packets = False
|
||||
|
||||
booklist_class = BookList
|
||||
book_class = Book
|
||||
|
||||
FORMATS = [ "snb" ]
|
||||
VENDOR_ID = 0x230b
|
||||
PRODUCT_ID = 0x0001
|
||||
BCD = None
|
||||
CAN_SET_METADATA = False
|
||||
THUMBNAIL_HEIGHT = 155
|
||||
|
||||
icon = I("devices/bambook.png")
|
||||
# OPEN_FEEDBACK_MESSAGE = _(
|
||||
# 'Connecting to Bambook device, please wait ...')
|
||||
BACKLOADING_ERROR_MESSAGE = _(
|
||||
'Unable to add book to library directly from Bambook. '
|
||||
'Please save the book to disk and add the file to library from disk.')
|
||||
|
||||
METADATA_CACHE = '.calibre.bambook'
|
||||
METADATA_FILE_GUID = 'calibremetadata.snb'
|
||||
|
||||
bambook = None
|
||||
|
||||
def reset(self, key='-1', log_packets=False, report_progress=None,
|
||||
detected_device=None) :
|
||||
self.open()
|
||||
|
||||
def open(self):
|
||||
# Make sure the Bambook library is ready
|
||||
if not is_bambook_lib_ready():
|
||||
raise OpenFeedback(_("Unable to connect to Bambook, you need to install Bambook library first."))
|
||||
# Disconnect first if connected
|
||||
self.eject()
|
||||
# Connect
|
||||
self.bambook = Bambook()
|
||||
self.bambook.Connect()
|
||||
if self.bambook.GetState() != CONN_CONNECTED:
|
||||
self.bambook = None
|
||||
raise Exception(_("Unable to connect to Bambook."))
|
||||
|
||||
def eject(self):
|
||||
if self.bambook:
|
||||
self.bambook.Disconnect()
|
||||
self.bambook = None
|
||||
|
||||
def post_yank_cleanup(self):
|
||||
self.eject()
|
||||
|
||||
def set_progress_reporter(self, report_progress):
|
||||
'''
|
||||
:param report_progress: Function that is called with a % progress
|
||||
(number between 0 and 100) for various tasks
|
||||
If it is called with -1 that means that the
|
||||
task does not have any progress information
|
||||
|
||||
'''
|
||||
self.report_progress = report_progress
|
||||
|
||||
def get_device_information(self, end_session=True):
|
||||
"""
|
||||
Ask device for device information. See L{DeviceInfoQuery}.
|
||||
|
||||
:return: (device name, device version, software version on device, mime type)
|
||||
|
||||
"""
|
||||
if self.bambook:
|
||||
deviceInfo = self.bambook.GetDeviceInfo()
|
||||
return (_("Bambook"), "SD928", deviceInfo.firmwareVersion, "MimeType")
|
||||
|
||||
def card_prefix(self, end_session=True):
|
||||
'''
|
||||
Return a 2 element list of the prefix to paths on the cards.
|
||||
If no card is present None is set for the card's prefix.
|
||||
E.G.
|
||||
('/place', '/place2')
|
||||
(None, 'place2')
|
||||
('place', None)
|
||||
(None, None)
|
||||
'''
|
||||
return (None, None)
|
||||
|
||||
def total_space(self, end_session=True):
|
||||
"""
|
||||
Get total space available on the mountpoints:
|
||||
1. Main memory
|
||||
2. Memory Card A
|
||||
3. Memory Card B
|
||||
|
||||
:return: A 3 element list with total space in bytes of (1, 2, 3). If a
|
||||
particular device doesn't have any of these locations it should return 0.
|
||||
|
||||
"""
|
||||
deviceInfo = self.bambook.GetDeviceInfo()
|
||||
return (deviceInfo.deviceVolume * 1024, 0, 0)
|
||||
|
||||
def free_space(self, end_session=True):
|
||||
"""
|
||||
Get free space available on the mountpoints:
|
||||
1. Main memory
|
||||
2. Card A
|
||||
3. Card B
|
||||
|
||||
:return: A 3 element list with free space in bytes of (1, 2, 3). If a
|
||||
particular device doesn't have any of these locations it should return -1.
|
||||
|
||||
"""
|
||||
deviceInfo = self.bambook.GetDeviceInfo()
|
||||
return (deviceInfo.spareVolume * 1024, -1, -1)
|
||||
|
||||
|
||||
def books(self, oncard=None, end_session=True):
|
||||
"""
|
||||
Return a list of ebooks on the device.
|
||||
|
||||
:param oncard: If 'carda' or 'cardb' return a list of ebooks on the
|
||||
specific storage card, otherwise return list of ebooks
|
||||
in main memory of device. If a card is specified and no
|
||||
books are on the card return empty list.
|
||||
|
||||
:return: A BookList.
|
||||
|
||||
"""
|
||||
# Bambook has no memroy card
|
||||
if oncard:
|
||||
return self.booklist_class(None, None, None)
|
||||
|
||||
# Get metadata cache
|
||||
prefix = ''
|
||||
booklist = self.booklist_class(oncard, prefix, self.settings)
|
||||
need_sync = self.parse_metadata_cache(booklist)
|
||||
|
||||
# Get book list from device
|
||||
devicebooks = self.bambook.GetBookList()
|
||||
books = []
|
||||
for book in devicebooks:
|
||||
if book.bookGuid == self.METADATA_FILE_GUID:
|
||||
continue
|
||||
b = self.book_class('', book.bookGuid)
|
||||
b.title = book.bookName.decode(text_encoding)
|
||||
b.authors = [ book.bookAuthor.decode(text_encoding) ]
|
||||
b.size = 0
|
||||
b.datatime = time.gmtime()
|
||||
b.lpath = book.bookGuid
|
||||
b.thumbnail = None
|
||||
b.tags = None
|
||||
b.comments = book.bookAbstract.decode(text_encoding)
|
||||
books.append(b)
|
||||
|
||||
# make a dict cache of paths so the lookup in the loop below is faster.
|
||||
bl_cache = {}
|
||||
for idx, b in enumerate(booklist):
|
||||
bl_cache[b.lpath] = idx
|
||||
|
||||
def update_booklist(book, prefix):
|
||||
changed = False
|
||||
try:
|
||||
idx = bl_cache.get(book.lpath, None)
|
||||
if idx is not None:
|
||||
bl_cache[book.lpath] = None
|
||||
if self.update_metadata_item(book, booklist[idx]):
|
||||
changed = True
|
||||
else:
|
||||
if booklist.add_book(book,
|
||||
replace_metadata=False):
|
||||
changed = True
|
||||
except: # Probably a filename encoding error
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
return changed
|
||||
|
||||
# Check each book on device whether it has a correspondig item
|
||||
# in metadata cache. If not, add it to cache.
|
||||
for i, book in enumerate(books):
|
||||
self.report_progress(i/float(len(books)), _('Getting list of books on device...'))
|
||||
changed = update_booklist(book, prefix)
|
||||
if changed:
|
||||
need_sync = True
|
||||
|
||||
# Remove books that are no longer in the Bambook. Cache contains
|
||||
# indices into the booklist if book not in filesystem, None otherwise
|
||||
# Do the operation in reverse order so indices remain valid
|
||||
for idx in sorted(bl_cache.itervalues(), reverse=True):
|
||||
if idx is not None:
|
||||
need_sync = True
|
||||
del booklist[idx]
|
||||
|
||||
if need_sync:
|
||||
self.sync_booklists((booklist, None, None))
|
||||
|
||||
self.report_progress(1.0, _('Getting list of books on device...'))
|
||||
return booklist
|
||||
|
||||
def upload_books(self, files, names, on_card=None, end_session=True,
|
||||
metadata=None):
|
||||
'''
|
||||
Upload a list of books to the device. If a file already
|
||||
exists on the device, it should be replaced.
|
||||
This method should raise a :class:`FreeSpaceError` if there is not enough
|
||||
free space on the device. The text of the FreeSpaceError must contain the
|
||||
word "card" if ``on_card`` is not None otherwise it must contain the word "memory".
|
||||
|
||||
:param files: A list of paths and/or file-like objects. If they are paths and
|
||||
the paths point to temporary files, they may have an additional
|
||||
attribute, original_file_path pointing to the originals. They may have
|
||||
another optional attribute, deleted_after_upload which if True means
|
||||
that the file pointed to by original_file_path will be deleted after
|
||||
being uploaded to the device.
|
||||
:param names: A list of file names that the books should have
|
||||
once uploaded to the device. len(names) == len(files)
|
||||
:param metadata: If not None, it is a list of :class:`Metadata` objects.
|
||||
The idea is to use the metadata to determine where on the device to
|
||||
put the book. len(metadata) == len(files). Apart from the regular
|
||||
cover (path to cover), there may also be a thumbnail attribute, which should
|
||||
be used in preference. The thumbnail attribute is of the form
|
||||
(width, height, cover_data as jpeg).
|
||||
|
||||
:return: A list of 3-element tuples. The list is meant to be passed
|
||||
to :meth:`add_books_to_metadata`.
|
||||
'''
|
||||
self.report_progress(0, _('Transferring books to device...'))
|
||||
paths = []
|
||||
if self.bambook:
|
||||
for (i, f) in enumerate(files):
|
||||
self.report_progress((i+1) / float(len(files)), _('Transferring books to device...'))
|
||||
if not hasattr(f, 'read'):
|
||||
if self.bambook.VerifySNB(f):
|
||||
guid = self.bambook.SendFile(f, self.get_guid(metadata[i].uuid))
|
||||
if guid:
|
||||
paths.append(guid)
|
||||
else:
|
||||
print "Send fail"
|
||||
else:
|
||||
print "book invalid"
|
||||
ret = zip(paths, cycle([on_card]))
|
||||
self.report_progress(1.0, _('Transferring books to device...'))
|
||||
return ret
|
||||
|
||||
def add_books_to_metadata(self, locations, metadata, booklists):
|
||||
metadata = iter(metadata)
|
||||
for i, location in enumerate(locations):
|
||||
self.report_progress((i+1) / float(len(locations)), _('Adding books to device metadata listing...'))
|
||||
info = metadata.next()
|
||||
|
||||
# Extract the correct prefix from the pathname. To do this correctly,
|
||||
# we must ensure that both the prefix and the path are normalized
|
||||
# so that the comparison will work. Book's __init__ will fix up
|
||||
# lpath, so we don't need to worry about that here.
|
||||
|
||||
book = self.book_class('', location[0], other=info)
|
||||
if book.size is None:
|
||||
book.size = 0
|
||||
b = booklists[0].add_book(book, replace_metadata=True)
|
||||
if b:
|
||||
b._new_book = True
|
||||
self.report_progress(1.0, _('Adding books to device metadata listing...'))
|
||||
|
||||
def delete_books(self, paths, end_session=True):
|
||||
'''
|
||||
Delete books at paths on device.
|
||||
'''
|
||||
if self.bambook:
|
||||
for i, path in enumerate(paths):
|
||||
self.report_progress((i+1) / float(len(paths)), _('Removing books from device...'))
|
||||
self.bambook.DeleteFile(path)
|
||||
self.report_progress(1.0, _('Removing books from device...'))
|
||||
|
||||
def remove_books_from_metadata(self, paths, booklists):
|
||||
'''
|
||||
Remove books from the metadata list. This function must not communicate
|
||||
with the device.
|
||||
|
||||
:param paths: paths to books on the device.
|
||||
:param booklists: A tuple containing the result of calls to
|
||||
(:meth:`books(oncard=None)`,
|
||||
:meth:`books(oncard='carda')`,
|
||||
:meth`books(oncard='cardb')`).
|
||||
|
||||
'''
|
||||
for i, path in enumerate(paths):
|
||||
self.report_progress((i+1) / float(len(paths)), _('Removing books from device metadata listing...'))
|
||||
for bl in booklists:
|
||||
for book in bl:
|
||||
if book.lpath == path:
|
||||
bl.remove_book(book)
|
||||
self.report_progress(1.0, _('Removing books from device metadata listing...'))
|
||||
|
||||
def sync_booklists(self, booklists, end_session=True):
|
||||
'''
|
||||
Update metadata on device.
|
||||
|
||||
:param booklists: A tuple containing the result of calls to
|
||||
(:meth:`books(oncard=None)`,
|
||||
:meth:`books(oncard='carda')`,
|
||||
:meth`books(oncard='cardb')`).
|
||||
|
||||
'''
|
||||
if not self.bambook:
|
||||
return
|
||||
|
||||
json_codec = JsonCodec()
|
||||
|
||||
# Create stub virtual book for sync info
|
||||
with TemporaryDirectory() as tdir:
|
||||
snbcdir = os.path.join(tdir, 'snbc')
|
||||
snbfdir = os.path.join(tdir, 'snbf')
|
||||
os.mkdir(snbcdir)
|
||||
os.mkdir(snbfdir)
|
||||
|
||||
f = open(os.path.join(snbfdir, 'book.snbf'), 'wb')
|
||||
f.write('''<book-snbf version="1.0">
|
||||
<head>
|
||||
<name>calibre同步信息</name>
|
||||
<author>calibre</author>
|
||||
<language>ZH-CN</language>
|
||||
<rights/>
|
||||
<publisher>calibre</publisher>
|
||||
<generator>''' + __appname__ + ' ' + __version__ + '''</generator>
|
||||
<created/>
|
||||
<abstract></abstract>
|
||||
<cover/>
|
||||
</head>
|
||||
</book-snbf>
|
||||
''')
|
||||
f.close()
|
||||
f = open(os.path.join(snbfdir, 'toc.snbf'), 'wb')
|
||||
f.write('''<toc-snbf>
|
||||
<head>
|
||||
<chapters>0</chapters>
|
||||
</head>
|
||||
<body>
|
||||
</body>
|
||||
</toc-snbf>
|
||||
''');
|
||||
f.close()
|
||||
cache_name = os.path.join(snbcdir, self.METADATA_CACHE)
|
||||
with open(cache_name, 'wb') as f:
|
||||
json_codec.encode_to_file(f, booklists[0])
|
||||
|
||||
with TemporaryFile('.snb') as f:
|
||||
if self.bambook.PackageSNB(f, tdir):
|
||||
if not self.bambook.SendFile(f, self.METADATA_FILE_GUID):
|
||||
print "Upload failed"
|
||||
else:
|
||||
print "Package failed"
|
||||
|
||||
# Clear the _new_book indication, as we are supposed to be done with
|
||||
# adding books at this point
|
||||
for blist in booklists:
|
||||
if blist is not None:
|
||||
for book in blist:
|
||||
book._new_book = False
|
||||
|
||||
self.report_progress(1.0, _('Sending metadata to device...'))
|
||||
|
||||
def get_file(self, path, outfile, end_session=True):
|
||||
'''
|
||||
Read the file at ``path`` on the device and write it to outfile.
|
||||
|
||||
:param outfile: file object like ``sys.stdout`` or the result of an
|
||||
:func:`open` call.
|
||||
|
||||
'''
|
||||
if self.bambook:
|
||||
with TemporaryDirectory() as tdir:
|
||||
if self.bambook.GetFile(path, tdir):
|
||||
filepath = os.path.join(tdir, path)
|
||||
f = file(filepath, 'rb')
|
||||
outfile.write(f.read())
|
||||
f.close()
|
||||
else:
|
||||
print "Unable to get file from Bambook:", path
|
||||
|
||||
@classmethod
|
||||
def config_widget(cls):
|
||||
'''
|
||||
Should return a QWidget. The QWidget contains the settings for the device interface
|
||||
'''
|
||||
from calibre.gui2.device_drivers.configwidget import ConfigWidget
|
||||
cw = ConfigWidget(cls.settings(), cls.FORMATS, cls.SUPPORTS_SUB_DIRS,
|
||||
cls.MUST_READ_METADATA, cls.SUPPORTS_USE_AUTHOR_SORT,
|
||||
cls.EXTRA_CUSTOMIZATION_MESSAGE)
|
||||
# Turn off the Save template
|
||||
cw.opt_save_template.setVisible(False)
|
||||
cw.label.setVisible(False)
|
||||
# Repurpose the metadata checkbox
|
||||
cw.opt_read_metadata.setVisible(False)
|
||||
# Repurpose the use_subdirs checkbox
|
||||
cw.opt_use_subdirs.setVisible(False)
|
||||
return cw
|
||||
|
||||
|
||||
# @classmethod
|
||||
# def save_settings(cls, settings_widget):
|
||||
# '''
|
||||
# Should save settings to disk. Takes the widget created in
|
||||
# :meth:`config_widget` and saves all settings to disk.
|
||||
# '''
|
||||
# raise NotImplementedError()
|
||||
|
||||
# @classmethod
|
||||
# def settings(cls):
|
||||
# '''
|
||||
# Should return an opts object. The opts object should have at least one attribute
|
||||
# `format_map` which is an ordered list of formats for the device.
|
||||
# '''
|
||||
# raise NotImplementedError()
|
||||
|
||||
def parse_metadata_cache(self, bl):
|
||||
need_sync = True
|
||||
if not self.bambook:
|
||||
return need_sync
|
||||
|
||||
# Get the metadata virtual book from Bambook
|
||||
with TemporaryDirectory() as tdir:
|
||||
if self.bambook.GetFile(self.METADATA_FILE_GUID, tdir):
|
||||
cache_name = os.path.join(tdir, self.METADATA_CACHE)
|
||||
if self.bambook.ExtractSNBContent(os.path.join(tdir, self.METADATA_FILE_GUID),
|
||||
'snbc/' + self.METADATA_CACHE,
|
||||
cache_name):
|
||||
json_codec = JsonCodec()
|
||||
if os.access(cache_name, os.R_OK):
|
||||
try:
|
||||
with open(cache_name, 'rb') as f:
|
||||
json_codec.decode_from_file(f, bl, self.book_class, '')
|
||||
need_sync = False
|
||||
except:
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
bl = []
|
||||
return need_sync
|
||||
|
||||
@classmethod
|
||||
def update_metadata_item(cls, book, blb):
|
||||
# Currently, we do not have enough information
|
||||
# from Bambook SDK to judge whether a book has
|
||||
# been changed, we assume all books has been
|
||||
# changed.
|
||||
changed = True
|
||||
# if book.bookName.decode(text_encoding) != blb.title:
|
||||
# changed = True
|
||||
# if book.bookAuthor.decode(text_encoding) != blb.authors[0]:
|
||||
# changed = True
|
||||
# if book.bookAbstract.decode(text_encoding) != blb.comments:
|
||||
# changed = True
|
||||
return changed
|
||||
|
||||
@staticmethod
|
||||
def get_guid(uuid):
|
||||
guid = hashlib.md5(uuid).hexdigest()[0:15] + ".snb"
|
||||
return guid
|
||||
530
src/calibre/devices/bambook/libbambookcore.py
Normal file
530
src/calibre/devices/bambook/libbambookcore.py
Normal file
@ -0,0 +1,530 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2010, Li Fanxi <lifanxi at freemindworld.com>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
'''
|
||||
Sanda library wrapper
|
||||
'''
|
||||
|
||||
import ctypes, uuid, hashlib, os, sys
|
||||
from threading import Event, Lock
|
||||
from calibre.constants import iswindows, islinux, isosx
|
||||
from calibre import load_library
|
||||
|
||||
try:
|
||||
_lib_name = 'libBambookCore'
|
||||
cdll = ctypes.cdll
|
||||
if iswindows:
|
||||
_lib_name = 'BambookCore'
|
||||
if hasattr(sys, 'frozen') and iswindows:
|
||||
lp = os.path.join(os.path.dirname(sys.executable), 'DLLs', 'BambookCore.dll')
|
||||
lib_handle = cdll.LoadLibrary(lp)
|
||||
elif hasattr(sys, 'frozen_path'):
|
||||
lp = os.path.join(sys.frozen_path, 'lib', 'libBambookCore.so')
|
||||
lib_handle = cdll.LoadLibrary(lp)
|
||||
else:
|
||||
lib_handle = load_library(_lib_name, cdll)
|
||||
except:
|
||||
lib_handle = None
|
||||
|
||||
if iswindows:
|
||||
text_encoding = 'mbcs'
|
||||
elif islinux:
|
||||
text_encoding = 'utf-8'
|
||||
elif isosx:
|
||||
text_encoding = 'utf-8'
|
||||
|
||||
def is_bambook_lib_ready():
|
||||
return lib_handle != None
|
||||
|
||||
# Constant
|
||||
DEFAULT_BAMBOOK_IP = '192.168.250.2'
|
||||
BAMBOOK_SDK_VERSION = 0x00090000
|
||||
BR_SUCC = 0 # 操作成功
|
||||
BR_FAIL = 1001 # 操作失败
|
||||
BR_NOT_IMPL = 1002 # 该功能还未实现
|
||||
BR_DISCONNECTED = 1003 # 与设备的连接已断开
|
||||
BR_PARAM_ERROR = 1004 # 调用函数传入的参数错误
|
||||
BR_TIMEOUT = 1005 # 操作或通讯超时
|
||||
BR_INVALID_HANDLE = 1006 # 传入的句柄无效
|
||||
BR_INVALID_FILE = 1007 # 传入的文件不存在或格式无效
|
||||
BR_INVALID_DIR = 1008 # 传入的目录不存在
|
||||
BR_BUSY = 1010 # 设备忙，另一个操作还未完成
|
||||
BR_EOF = 1011 # 文件或操作已结束
|
||||
BR_IO_ERROR = 1012 # 文件读写失败
|
||||
BR_FILE_NOT_INSIDE = 1013 # 指定的文件不在包里
|
||||
|
||||
# 当前连接状态
|
||||
CONN_CONNECTED = 0 # 已连接
|
||||
CONN_DISCONNECTED = 1 # 未连接或连接已断开
|
||||
CONN_CONNECTING = 2 # 正在连接
|
||||
CONN_WAIT_FOR_AUTH = 3 # 已连接，正在等待身份验证（暂未实现）
|
||||
|
||||
#传输状态
|
||||
TRANS_STATUS_TRANS = 0 #正在传输
|
||||
TRANS_STATUS_DONE = 1 #传输完成
|
||||
TRANS_STATUS_ERR = 2 #传输出错
|
||||
|
||||
# Key Enums
|
||||
BBKeyNum0 = 0
|
||||
BBKeyNum1 = 1
|
||||
BBKeyNum2 = 2
|
||||
BBKeyNum3 = 3
|
||||
BBKeyNum4 = 4
|
||||
BBKeyNum5 = 5
|
||||
BBKeyNum6 = 6
|
||||
BBKeyNum7 = 7
|
||||
BBKeyNum8 = 8
|
||||
BBKeyNum9 = 9
|
||||
BBKeyStar = 10
|
||||
BBKeyCross = 11
|
||||
BBKeyUp = 12
|
||||
BBKeyDown = 13
|
||||
BBKeyLeft = 14
|
||||
BBKeyRight = 15
|
||||
BBKeyPageUp = 16
|
||||
BBKeyPageDown = 17
|
||||
BBKeyOK = 18
|
||||
BBKeyESC = 19
|
||||
BBKeyBookshelf = 20
|
||||
BBKeyStore = 21
|
||||
BBKeyTTS = 22
|
||||
BBKeyMenu = 23
|
||||
BBKeyInteract =24
|
||||
|
||||
class DeviceInfo(ctypes.Structure):
|
||||
_fields_ = [ ("cbSize", ctypes.c_int),
|
||||
("sn", ctypes.c_char * 20),
|
||||
("firmwareVersion", ctypes.c_char * 20),
|
||||
("deviceVolume", ctypes.c_int),
|
||||
("spareVolume", ctypes.c_int),
|
||||
]
|
||||
def __init__(self):
|
||||
self.cbSize = ctypes.sizeof(self)
|
||||
|
||||
class PrivBookInfo(ctypes.Structure):
|
||||
_fields_ = [ ("cbSize", ctypes.c_int),
|
||||
("bookGuid", ctypes.c_char * 20),
|
||||
("bookName", ctypes.c_char * 80),
|
||||
("bookAuthor", ctypes.c_char * 40),
|
||||
("bookAbstract", ctypes.c_char * 256),
|
||||
]
|
||||
def Clone(self):
|
||||
bookInfo = PrivBookInfo()
|
||||
bookInfo.cbSize = self.cbSize
|
||||
bookInfo.bookGuid = self.bookGuid
|
||||
bookInfo.bookName = self.bookName
|
||||
bookInfo.bookAuthor = self.bookAuthor
|
||||
bookInfo.bookAbstract = self.bookAbstract
|
||||
return bookInfo
|
||||
|
||||
def __init__(self):
|
||||
self.cbSize = ctypes.sizeof(self)
|
||||
|
||||
# extern "C"_declspec(dllexport) BB_RESULT BambookConnect(const char* lpszIP, int timeOut, BB_HANDLE* hConn);
|
||||
def BambookConnect(ip = DEFAULT_BAMBOOK_IP, timeout = 0):
|
||||
if isinstance(ip, unicode):
|
||||
ip = ip.encode('ascii')
|
||||
handle = ctypes.c_void_p(0)
|
||||
if lib_handle == None:
|
||||
raise Exception(_('Bambook SDK has not been installed.'))
|
||||
ret = lib_handle.BambookConnect(ip, timeout, ctypes.byref(handle))
|
||||
if ret == BR_SUCC:
|
||||
return handle
|
||||
else:
|
||||
return None
|
||||
|
||||
# extern "C" _declspec(dllexport) BB_RESULT BambookGetConnectStatus(BB_HANDLE hConn, int* status);
|
||||
def BambookGetConnectStatus(handle):
|
||||
status = ctypes.c_int(0)
|
||||
ret = lib_handle.BambookGetConnectStatus(handle, ctypes.byref(status))
|
||||
if ret == BR_SUCC:
|
||||
return status.value
|
||||
else:
|
||||
return None
|
||||
|
||||
# extern "C" _declspec(dllexport) BB_RESULT BambookDisconnect(BB_HANDLE hConn);
|
||||
def BambookDisconnect(handle):
|
||||
ret = lib_handle.BambookDisconnect(handle)
|
||||
if ret == BR_SUCC:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
# extern "C" const char * BambookGetErrorString(BB_RESULT nCode)
|
||||
def BambookGetErrorString(code):
|
||||
func = lib_handle.BambookGetErrorString
|
||||
func.restype = ctypes.c_char_p
|
||||
return func(code)
|
||||
|
||||
|
||||
# extern "C" BB_RESULT BambookGetSDKVersion(uint32_t * version);
|
||||
def BambookGetSDKVersion():
|
||||
version = ctypes.c_int(0)
|
||||
lib_handle.BambookGetSDKVersion(ctypes.byref(version))
|
||||
return version.value
|
||||
|
||||
# extern "C" BB_RESULT BambookGetDeviceInfo(BB_HANDLE hConn, DeviceInfo* pInfo);
|
||||
def BambookGetDeviceInfo(handle):
|
||||
deviceInfo = DeviceInfo()
|
||||
ret = lib_handle.BambookGetDeviceInfo(handle, ctypes.byref(deviceInfo))
|
||||
if ret == BR_SUCC:
|
||||
return deviceInfo
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
# extern "C" BB_RESULT BambookKeyPress(BB_HANDLE hConn, BambookKey key);
|
||||
def BambookKeyPress(handle, key):
|
||||
ret = lib_handle.BambookKeyPress(handle, key)
|
||||
if ret == BR_SUCC:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
# extern "C" BB_RESULT BambookGetFirstPrivBookInfo(BB_HANDLE hConn, PrivBookInfo * pInfo);
|
||||
def BambookGetFirstPrivBookInfo(handle, bookInfo):
|
||||
bookInfo.contents.cbSize = ctypes.sizeof(bookInfo.contents)
|
||||
ret = lib_handle.BambookGetFirstPrivBookInfo(handle, bookInfo)
|
||||
if ret == BR_SUCC:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
# extern "C" BB_RESULT BambookGetNextPrivBookInfo(BB_HANDLE hConn, PrivBookInfo * pInfo);
|
||||
def BambookGetNextPrivBookInfo(handle, bookInfo):
|
||||
bookInfo.contents.cbSize = ctypes.sizeof(bookInfo.contents)
|
||||
ret = lib_handle.BambookGetNextPrivBookInfo(handle, bookInfo)
|
||||
if ret == BR_SUCC:
|
||||
return True
|
||||
elif ret == BR_EOF:
|
||||
return False
|
||||
else:
|
||||
return False
|
||||
|
||||
# extern "C" BB_RESULT BambookDeletePrivBook(BB_HANDLE hConn, const char * lpszBookID);
|
||||
def BambookDeletePrivBook(handle, guid):
|
||||
if isinstance(guid, unicode):
|
||||
guid = guid.encode('ascii')
|
||||
ret = lib_handle.BambookDeletePrivBook(handle, guid)
|
||||
if ret == BR_SUCC:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
class JobQueue:
|
||||
jobs = {}
|
||||
maxID = 0
|
||||
lock = Lock()
|
||||
def __init__(self):
|
||||
self.maxID = 0
|
||||
|
||||
def NewJob(self):
|
||||
self.lock.acquire()
|
||||
self.maxID = self.maxID + 1
|
||||
maxid = self.maxID
|
||||
self.lock.release()
|
||||
event = Event()
|
||||
self.jobs[maxid] = (event, TRANS_STATUS_TRANS)
|
||||
return maxid
|
||||
|
||||
def FinishJob(self, jobID, status):
|
||||
self.jobs[jobID] = (self.jobs[jobID][0], status)
|
||||
self.jobs[jobID][0].set()
|
||||
|
||||
def WaitJob(self, jobID):
|
||||
self.jobs[jobID][0].wait()
|
||||
return (self.jobs[jobID][1] == TRANS_STATUS_DONE)
|
||||
|
||||
def DeleteJob(self, jobID):
|
||||
del self.jobs[jobID]
|
||||
|
||||
job = JobQueue()
|
||||
|
||||
def BambookTransferCallback(status, progress, userData):
|
||||
if status == TRANS_STATUS_DONE and progress == 100:
|
||||
job.FinishJob(userData, status)
|
||||
elif status == TRANS_STATUS_ERR:
|
||||
job.FinishJob(userData, status)
|
||||
|
||||
TransCallback = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_int, ctypes.c_int)
|
||||
bambookTransferCallback = TransCallback(BambookTransferCallback)
|
||||
|
||||
# extern "C" BB_RESULT BambookAddPrivBook(BB_HANDLE hConn, const char * pszSnbFile,
|
||||
# TransCallback pCallbackFunc, intptr_t userData);
|
||||
def BambookAddPrivBook(handle, filename, callback, userData):
|
||||
if isinstance(filename, unicode):
|
||||
filename = filename.encode('ascii')
|
||||
ret = lib_handle.BambookAddPrivBook(handle, filename, callback, userData)
|
||||
if ret == BR_SUCC:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
# extern "C" BB_RESULT BambookReplacePrivBook(BB_HANDLE hConn, const char *
|
||||
# pszSnbFile, const char * lpszBookID, TransCallback pCallbackFunc, intptr_t userData);
|
||||
def BambookReplacePrivBook(handle, filename, bookID, callback, userData):
|
||||
if isinstance(filename, unicode):
|
||||
filename = filename.encode('ascii')
|
||||
if isinstance(bookID, unicode):
|
||||
bookID = bookID.encode('ascii')
|
||||
ret = lib_handle.BambookReplacePrivBook(handle, filename, bookID, callback, userData)
|
||||
if ret == BR_SUCC:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
# extern "C" BB_RESULT BambookFetchPrivBook(BB_HANDLE hConn, const char *
|
||||
# lpszBookID, const char * lpszFilePath, TransCallback pCallbackFunc, intptr_t userData);
|
||||
def BambookFetchPrivBook(handle, bookID, filename, callback, userData):
|
||||
if isinstance(filename, unicode):
|
||||
filename = filename.encode('ascii')
|
||||
if isinstance(bookID, unicode):
|
||||
bookID = bookID.encode('ascii')
|
||||
ret = lib_handle.BambookFetchPrivBook(handle, bookID, filename, bambookTransferCallback, userData)
|
||||
if ret == BR_SUCC:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
# extern "C" BB_RESULT BambookVerifySnbFile(const char * snbName)
|
||||
def BambookVerifySnbFile(filename):
|
||||
if isinstance(filename, unicode):
|
||||
filename = filename.encode('ascii')
|
||||
if lib_handle.BambookVerifySnbFile(filename) == BR_SUCC:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
# BB_RESULT BambookPackSnbFromDir ( const char * snbName,, const char * rootDir );
|
||||
def BambookPackSnbFromDir(snbFileName, rootDir):
|
||||
if isinstance(snbFileName, unicode):
|
||||
snbFileName = snbFileName.encode('ascii')
|
||||
if isinstance(rootDir, unicode):
|
||||
rootDir = rootDir.encode('ascii')
|
||||
ret = lib_handle.BambookPackSnbFromDir(snbFileName, rootDir)
|
||||
if ret == BR_SUCC:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
# BB_RESULT BambookUnpackFileFromSnb ( const char * snbName,, const char * relativePath, const char * outfname );
|
||||
def BambookUnpackFileFromSnb(snbFileName, relPath, outFileName):
|
||||
if isinstance(snbFileName, unicode):
|
||||
snbFileName = snbFileName.encode('ascii')
|
||||
if isinstance(relPath, unicode):
|
||||
relPath = relPath.encode('ascii')
|
||||
if isinstance(outFileName, unicode):
|
||||
outFileName = outFileName.encode('ascii')
|
||||
ret = lib_handle.BambookUnpackFileFromSnb(snbFileName, relPath, outFileName)
|
||||
if ret == BR_SUCC:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
class Bambook:
|
||||
def __init__(self):
|
||||
self.handle = None
|
||||
|
||||
def Connect(self, ip = DEFAULT_BAMBOOK_IP, timeout = 10000):
|
||||
self.handle = BambookConnect(ip, timeout)
|
||||
if self.handle and self.handle != 0:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
def Disconnect(self):
|
||||
if self.handle:
|
||||
return BambookDisconnect(self.handle)
|
||||
return False
|
||||
|
||||
def GetState(self):
|
||||
if self.handle:
|
||||
return BambookGetConnectStatus(self.handle)
|
||||
return CONN_DISCONNECTED
|
||||
|
||||
def GetDeviceInfo(self):
|
||||
if self.handle:
|
||||
return BambookGetDeviceInfo(self.handle)
|
||||
return None
|
||||
|
||||
def SendFile(self, fileName, guid = None):
|
||||
if self.handle:
|
||||
taskID = job.NewJob()
|
||||
if guid:
|
||||
if BambookReplacePrivBook(self.handle, fileName, guid,
|
||||
bambookTransferCallback, taskID):
|
||||
if(job.WaitJob(taskID)):
|
||||
job.DeleteJob(taskID)
|
||||
return guid
|
||||
else:
|
||||
job.DeleteJob(taskID)
|
||||
return None
|
||||
else:
|
||||
job.DeleteJob(taskID)
|
||||
return None
|
||||
else:
|
||||
guid = hashlib.md5(str(uuid.uuid4())).hexdigest()[0:15] + ".snb"
|
||||
if BambookReplacePrivBook(self.handle, fileName, guid,
|
||||
bambookTransferCallback, taskID):
|
||||
if job.WaitJob(taskID):
|
||||
job.DeleteJob(taskID)
|
||||
return guid
|
||||
else:
|
||||
job.DeleteJob(taskID)
|
||||
return None
|
||||
else:
|
||||
job.DeleteJob(taskID)
|
||||
return None
|
||||
return False
|
||||
|
||||
def GetFile(self, guid, fileName):
|
||||
if self.handle:
|
||||
taskID = job.NewJob()
|
||||
ret = BambookFetchPrivBook(self.handle, guid, fileName, bambookTransferCallback, taskID)
|
||||
if ret:
|
||||
ret = job.WaitJob(taskID)
|
||||
job.DeleteJob(taskID)
|
||||
return ret
|
||||
else:
|
||||
job.DeleteJob(taskID)
|
||||
return False
|
||||
return False
|
||||
|
||||
def DeleteFile(self, guid):
|
||||
if self.handle:
|
||||
ret = BambookDeletePrivBook(self.handle, guid)
|
||||
return ret
|
||||
return False
|
||||
|
||||
def GetBookList(self):
|
||||
if self.handle:
|
||||
books = []
|
||||
bookInfo = PrivBookInfo()
|
||||
bi = ctypes.pointer(bookInfo)
|
||||
|
||||
ret = BambookGetFirstPrivBookInfo(self.handle, bi)
|
||||
while ret:
|
||||
books.append(bi.contents.Clone())
|
||||
ret = BambookGetNextPrivBookInfo(self.handle, bi)
|
||||
return books
|
||||
|
||||
@staticmethod
|
||||
def GetSDKVersion():
|
||||
return BambookGetSDKVersion()
|
||||
|
||||
@staticmethod
|
||||
def VerifySNB(fileName):
|
||||
return BambookVerifySnbFile(fileName);
|
||||
|
||||
@staticmethod
|
||||
def ExtractSNBContent(fileName, relPath, path):
|
||||
return BambookUnpackFileFromSnb(fileName, relPath, path)
|
||||
|
||||
@staticmethod
|
||||
def ExtractSNB(fileName, path):
|
||||
ret = BambookUnpackFileFromSnb(fileName, 'snbf/book.snbf', path + '/snbf/book.snbf')
|
||||
if not ret:
|
||||
return False
|
||||
ret = BambookUnpackFileFromSnb(fileName, 'snbf/toc.snbf', path + '/snbf/toc.snbf')
|
||||
if not ret:
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
@staticmethod
|
||||
def PackageSNB(fileName, path):
|
||||
return BambookPackSnbFromDir(fileName, path)
|
||||
|
||||
def passed():
|
||||
print "> Pass"
|
||||
|
||||
def failed():
|
||||
print "> Failed"
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
print "Bambook SDK Unit Test"
|
||||
bb = Bambook()
|
||||
|
||||
print "Disconnect State"
|
||||
if bb.GetState() == CONN_DISCONNECTED:
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
|
||||
print "Get SDK Version"
|
||||
if bb.GetSDKVersion() == BAMBOOK_SDK_VERSION:
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
|
||||
print "Verify good SNB File"
|
||||
if bb.VerifySNB(u'/tmp/f8268e6c1f4e78c.snb'):
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
|
||||
print "Verify bad SNB File"
|
||||
if not bb.VerifySNB('./libwrapper.py'):
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
|
||||
print "Extract SNB File"
|
||||
if bb.ExtractSNB('./test.snb', '/tmp/test'):
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
|
||||
print "Packet SNB File"
|
||||
if bb.PackageSNB('/tmp/tmp.snb', '/tmp/test') and bb.VerifySNB('/tmp/tmp.snb'):
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
|
||||
print "Connect to Bambook"
|
||||
if bb.Connect('192.168.250.2', 10000) and bb.GetState() == CONN_CONNECTED:
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
|
||||
print "Get Bambook Info"
|
||||
devInfo = bb.GetDeviceInfo()
|
||||
if devInfo:
|
||||
# print "Info Size: ", devInfo.cbSize
|
||||
# print "SN: ", devInfo.sn
|
||||
# print "Firmware: ", devInfo.firmwareVersion
|
||||
# print "Capacity: ", devInfo.deviceVolume
|
||||
# print "Free: ", devInfo.spareVolume
|
||||
if devInfo.cbSize == 52 and devInfo.deviceVolume == 1714232:
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
|
||||
print "Send file"
|
||||
if bb.SendFile('/tmp/tmp.snb'):
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
|
||||
print "Get book list"
|
||||
books = bb.GetBookList()
|
||||
if len(books) > 10:
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
|
||||
print "Get book"
|
||||
if bb.GetFile('f8268e6c1f4e78c.snb', '/tmp') and bb.VerifySNB('/tmp/f8268e6c1f4e78c.snb'):
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
|
||||
print "Disconnect"
|
||||
if bb.Disconnect():
|
||||
passed()
|
||||
else:
|
||||
failed()
|
||||
@ -266,3 +266,12 @@ class POCKETBOOK701(USBMS):
|
||||
VENDOR_NAME = 'ANDROID'
|
||||
WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = '__UMS_COMPOSITE'
|
||||
|
||||
def windows_sort_drives(self, drives):
|
||||
if len(drives) < 2: return drives
|
||||
main = drives.get('main', None)
|
||||
carda = drives.get('carda', None)
|
||||
if main and carda:
|
||||
drives['main'] = carda
|
||||
drives['carda'] = main
|
||||
return drives
|
||||
|
||||
|
||||
@ -62,9 +62,9 @@ class SWEEX(USBMS):
|
||||
# Ordered list of supported formats
|
||||
FORMATS = ['epub', 'prc', 'fb2', 'html', 'rtf', 'chm', 'pdf', 'txt']
|
||||
|
||||
VENDOR_ID = [0x0525]
|
||||
PRODUCT_ID = [0xa4a5]
|
||||
BCD = [0x0319]
|
||||
VENDOR_ID = [0x0525, 0x177f]
|
||||
PRODUCT_ID = [0xa4a5, 0x300]
|
||||
BCD = [0x0319, 0x110]
|
||||
|
||||
VENDOR_NAME = 'SWEEX'
|
||||
WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'EBOOKREADER'
|
||||
@ -104,7 +104,7 @@ class PDNOVEL(USBMS):
|
||||
|
||||
VENDOR_NAME = 'ANDROID'
|
||||
WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = '__UMS_COMPOSITE'
|
||||
THUMBNAIL_HEIGHT = 144
|
||||
THUMBNAIL_HEIGHT = 130
|
||||
|
||||
EBOOK_DIR_MAIN = 'eBooks'
|
||||
SUPPORTS_SUB_DIRS = False
|
||||
@ -204,3 +204,43 @@ class LUMIREAD(USBMS):
|
||||
with open(cfilepath+'.jpg', 'wb') as f:
|
||||
f.write(metadata.thumbnail[-1])
|
||||
|
||||
class ALURATEK_COLOR(USBMS):
|
||||
|
||||
name = 'Aluratek Color Device Interface'
|
||||
gui_name = 'Aluratek Color'
|
||||
description = _('Communicate with the Aluratek Color')
|
||||
author = 'Kovid Goyal'
|
||||
supported_platforms = ['windows', 'osx', 'linux']
|
||||
|
||||
# Ordered list of supported formats
|
||||
FORMATS = ['epub', 'fb2', 'txt', 'pdf']
|
||||
|
||||
VENDOR_ID = [0x1f3a]
|
||||
PRODUCT_ID = [0x1000]
|
||||
BCD = [0x0002]
|
||||
|
||||
EBOOK_DIR_MAIN = EBOOK_DIR_CARD_A = 'books'
|
||||
|
||||
VENDOR_NAME = 'USB_2.0'
|
||||
WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'USB_FLASH_DRIVER'
|
||||
|
||||
class TREKSTOR(USBMS):
|
||||
|
||||
name = 'Trekstor E-book player device interface'
|
||||
gui_name = 'Trekstor'
|
||||
description = _('Communicate with the Trekstor')
|
||||
author = 'Kovid Goyal'
|
||||
supported_platforms = ['windows', 'osx', 'linux']
|
||||
|
||||
# Ordered list of supported formats
|
||||
FORMATS = ['epub', 'txt', 'pdf']
|
||||
|
||||
VENDOR_ID = [0x1e68]
|
||||
PRODUCT_ID = [0x0041]
|
||||
BCD = [0x0002]
|
||||
|
||||
EBOOK_DIR_MAIN = 'Ebooks'
|
||||
|
||||
VENDOR_NAME = 'TREKSTOR'
|
||||
WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'EBOOK_PLAYER_7'
|
||||
|
||||
|
||||
@ -58,9 +58,16 @@ class PRS505(USBMS):
|
||||
SUPPORTS_USE_AUTHOR_SORT = True
|
||||
EBOOK_DIR_MAIN = 'database/media/books'
|
||||
|
||||
ALL_BY_TITLE = _('All by title')
|
||||
ALL_BY_AUTHOR = _('All by author')
|
||||
|
||||
EXTRA_CUSTOMIZATION_MESSAGE = _('Comma separated list of metadata fields '
|
||||
'to turn into collections on the device. Possibilities include: ')+\
|
||||
'series, tags, authors'
|
||||
'series, tags, authors' +\
|
||||
_('. Two special collections are available: %s:%s and %s:%s. Add '
|
||||
'these values to the list to enable them. The collections will be '
|
||||
'given the name provided after the ":" character.')%(
|
||||
'abt', ALL_BY_TITLE, 'aba', ALL_BY_AUTHOR)
|
||||
EXTRA_CUSTOMIZATION_DEFAULT = ', '.join(['series', 'tags'])
|
||||
|
||||
plugboard = None
|
||||
@ -151,7 +158,7 @@ class PRS505(USBMS):
|
||||
blists[i] = booklists[i]
|
||||
opts = self.settings()
|
||||
if opts.extra_customization:
|
||||
collections = [x.lower().strip() for x in
|
||||
collections = [x.strip() for x in
|
||||
opts.extra_customization.split(',')]
|
||||
else:
|
||||
collections = []
|
||||
@ -179,6 +186,8 @@ class PRS505(USBMS):
|
||||
self.plugboard_func = pb_func
|
||||
|
||||
def upload_cover(self, path, filename, metadata, filepath):
|
||||
return # Disabled as the SONY's don't need this thumbnail anyway and
|
||||
# older models don't auto delete it
|
||||
if metadata.thumbnail and metadata.thumbnail[-1]:
|
||||
path = path.replace('/', os.sep)
|
||||
is_main = path.startswith(self._main_prefix)
|
||||
|
||||
@ -410,6 +410,9 @@ class XMLCache(object):
|
||||
newmi = book.deepcopy_metadata()
|
||||
newmi.template_to_attribute(book, plugboard)
|
||||
newmi.set('_new_book', getattr(book, '_new_book', False))
|
||||
book.set('_pb_title_sort',
|
||||
newmi.get('title_sort', newmi.get('title', None)))
|
||||
book.set('_pb_author_sort', newmi.get('author_sort', ''))
|
||||
else:
|
||||
newmi = book
|
||||
(gtz_count, ltz_count, use_tz_var) = \
|
||||
|
||||
@ -72,3 +72,13 @@ class SOVOS(TECLAST_K3):
|
||||
VENDOR_NAME = 'RK28XX'
|
||||
WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'USB-MSC'
|
||||
|
||||
class SUNSTECH_EB700(TECLAST_K3):
|
||||
name = 'Sunstech EB700 device interface'
|
||||
gui_name = 'EB700'
|
||||
description = _('Communicate with the Sunstech EB700 reader.')
|
||||
|
||||
FORMATS = ['epub', 'fb2', 'pdf', 'pdb', 'txt']
|
||||
|
||||
VENDOR_NAME = 'SUNEB700'
|
||||
WINDOWS_MAIN_MEM = 'USB-MSC'
|
||||
|
||||
|
||||
@ -132,9 +132,24 @@ class CollectionsBookList(BookList):
|
||||
use_renaming_rules = prefs['manage_device_metadata'] == 'on_connect'
|
||||
|
||||
collections = {}
|
||||
# This map of sets is used to avoid linear searches when testing for
|
||||
# book equality
|
||||
|
||||
# get the special collection names
|
||||
all_by_author = ''
|
||||
all_by_title = ''
|
||||
ca = []
|
||||
for c in collection_attributes:
|
||||
if c.startswith('aba:') and c[4:]:
|
||||
all_by_author = c[4:].strip()
|
||||
elif c.startswith('abt:') and c[4:]:
|
||||
all_by_title = c[4:].strip()
|
||||
else:
|
||||
ca.append(c.lower())
|
||||
collection_attributes = ca
|
||||
|
||||
for book in self:
|
||||
tsval = book.get('_pb_title_sort',
|
||||
book.get('title_sort', book.get('title', 'zzzz')))
|
||||
asval = book.get('_pb_author_sort', book.get('author_sort', ''))
|
||||
# Make sure we can identify this book via the lpath
|
||||
lpath = getattr(book, 'lpath', None)
|
||||
if lpath is None:
|
||||
@ -211,22 +226,29 @@ class CollectionsBookList(BookList):
|
||||
collections[cat_name] = {}
|
||||
if use_renaming_rules and sort_attr:
|
||||
sort_val = book.get(sort_attr, None)
|
||||
collections[cat_name][lpath] = \
|
||||
(book, sort_val, book.get('title_sort', 'zzzz'))
|
||||
collections[cat_name][lpath] = (book, sort_val, tsval)
|
||||
elif is_series:
|
||||
if doing_dc:
|
||||
collections[cat_name][lpath] = \
|
||||
(book, book.get('series_index', sys.maxint),
|
||||
book.get('title_sort', 'zzzz'))
|
||||
(book, book.get('series_index', sys.maxint), tsval)
|
||||
else:
|
||||
collections[cat_name][lpath] = \
|
||||
(book, book.get(attr+'_index', sys.maxint),
|
||||
book.get('title_sort', 'zzzz'))
|
||||
(book, book.get(attr+'_index', sys.maxint), tsval)
|
||||
else:
|
||||
if lpath not in collections[cat_name]:
|
||||
collections[cat_name][lpath] = \
|
||||
(book, book.get('title_sort', 'zzzz'),
|
||||
book.get('title_sort', 'zzzz'))
|
||||
collections[cat_name][lpath] = (book, tsval, tsval)
|
||||
|
||||
# All books by author
|
||||
if all_by_author:
|
||||
if all_by_author not in collections:
|
||||
collections[all_by_author] = {}
|
||||
collections[all_by_author][lpath] = (book, asval, tsval)
|
||||
# All books by title
|
||||
if all_by_title:
|
||||
if all_by_title not in collections:
|
||||
collections[all_by_title] = {}
|
||||
collections[all_by_title][lpath] = (book, tsval, asval)
|
||||
|
||||
# Sort collections
|
||||
result = {}
|
||||
|
||||
|
||||
@ -605,8 +605,9 @@ class Device(DeviceConfig, DevicePlugin):
|
||||
|
||||
main, carda, cardb = self.find_device_nodes()
|
||||
if main is None:
|
||||
raise DeviceError(_('Unable to detect the %s disk drive. Your '
|
||||
' kernel is probably exporting a deprecated version of SYSFS.')
|
||||
raise DeviceError(_('Unable to detect the %s disk drive. Either '
|
||||
'the device has already been ejected, or your '
|
||||
'kernel is exporting a deprecated version of SYSFS.')
|
||||
%self.__class__.__name__)
|
||||
|
||||
self._linux_mount_map = {}
|
||||
|
||||
@ -27,13 +27,10 @@ class FB2MLizer(object):
|
||||
'''
|
||||
Todo: * Include more FB2 specific tags in the conversion.
|
||||
* Handle a tags.
|
||||
* Figure out some way to turn oeb_book.toc items into <section><title>
|
||||
<p> to allow for readers to generate toc from the document.
|
||||
'''
|
||||
|
||||
def __init__(self, log):
|
||||
self.log = log
|
||||
self.image_hrefs = {}
|
||||
self.reset_state()
|
||||
|
||||
def reset_state(self):
|
||||
@ -43,17 +40,25 @@ class FB2MLizer(object):
|
||||
# in different directories. FB2 images are all in a flat layout so we rename all images
|
||||
# into a sequential numbering system to ensure there are no collisions between image names.
|
||||
self.image_hrefs = {}
|
||||
# Mapping of toc items and their
|
||||
self.toc = {}
|
||||
# Used to see whether a new <section> needs to be opened
|
||||
self.section_level = 0
|
||||
|
||||
def extract_content(self, oeb_book, opts):
|
||||
self.log.info('Converting XHTML to FB2 markup...')
|
||||
self.oeb_book = oeb_book
|
||||
self.opts = opts
|
||||
self.reset_state()
|
||||
|
||||
# Used for adding <section>s and <title>s to allow readers
|
||||
# to generate toc from the document.
|
||||
if self.opts.sectionize == 'toc':
|
||||
self.create_flat_toc(self.oeb_book.toc, 1)
|
||||
|
||||
return self.fb2mlize_spine()
|
||||
|
||||
def fb2mlize_spine(self):
|
||||
self.reset_state()
|
||||
|
||||
output = [self.fb2_header()]
|
||||
output.append(self.get_text())
|
||||
output.append(self.fb2mlize_images())
|
||||
@ -66,13 +71,19 @@ class FB2MLizer(object):
|
||||
return u'<?xml version="1.0" encoding="UTF-8"?>' + output
|
||||
|
||||
def clean_text(self, text):
|
||||
text = re.sub(r'(?miu)<section>\s*</section>', '', text)
|
||||
text = re.sub(r'(?miu)\s+</section>', '</section>', text)
|
||||
text = re.sub(r'(?miu)</section><section>', '</section>\n\n<section>', text)
|
||||
|
||||
text = re.sub(r'(?miu)<p>\s*</p>', '', text)
|
||||
text = re.sub(r'(?miu)\s+</p>', '</p>', text)
|
||||
text = re.sub(r'(?miu)</p><p>', '</p>\n\n<p>', text)
|
||||
text = re.sub(r'(?miu)\s*</p>', '</p>', text)
|
||||
text = re.sub(r'(?miu)</p>\s*<p>', '</p>\n\n<p>', text)
|
||||
|
||||
text = re.sub(r'(?miu)<title>\s*</title>', '', text)
|
||||
text = re.sub(r'(?miu)\s+</title>', '</title>', text)
|
||||
|
||||
text = re.sub(r'(?miu)<section>\s*</section>', '', text)
|
||||
text = re.sub(r'(?miu)\s*</section>', '\n</section>', text)
|
||||
text = re.sub(r'(?miu)</section>\s*', '</section>\n\n', text)
|
||||
text = re.sub(r'(?miu)\s*<section>', '\n<section>', text)
|
||||
text = re.sub(r'(?miu)<section>\s*', '<section>\n', text)
|
||||
text = re.sub(r'(?miu)</section><section>', '</section>\n\n<section>', text)
|
||||
|
||||
if self.opts.insert_blank_line:
|
||||
text = re.sub(r'(?miu)</p>', '</p><empty-line />', text)
|
||||
@ -144,12 +155,34 @@ class FB2MLizer(object):
|
||||
|
||||
def get_text(self):
|
||||
text = ['<body>']
|
||||
|
||||
# Create main section if there are no others to create
|
||||
if self.opts.sectionize == 'nothing':
|
||||
text.append('<section>')
|
||||
self.section_level += 1
|
||||
|
||||
for item in self.oeb_book.spine:
|
||||
self.log.debug('Converting %s to FictionBook2 XML' % item.href)
|
||||
stylizer = Stylizer(item.data, item.href, self.oeb_book, self.opts, self.opts.output_profile)
|
||||
text.append('<section>')
|
||||
|
||||
# Start a <section> if we must sectionize each file or if the TOC references this page
|
||||
page_section_open = False
|
||||
if self.opts.sectionize == 'files' or self.toc.get(item.href) == 'page':
|
||||
text.append('<section>')
|
||||
page_section_open = True
|
||||
self.section_level += 1
|
||||
|
||||
text += self.dump_text(item.data.find(XHTML('body')), stylizer, item)
|
||||
|
||||
if page_section_open:
|
||||
text.append('</section>')
|
||||
self.section_level -= 1
|
||||
|
||||
# Close any open sections
|
||||
while self.section_level > 0:
|
||||
text.append('</section>')
|
||||
self.section_level -= 1
|
||||
|
||||
return ''.join(text) + '</body>'
|
||||
|
||||
def fb2mlize_images(self):
|
||||
@ -184,6 +217,17 @@ class FB2MLizer(object):
|
||||
'%s.' % (item.href, e))
|
||||
return ''.join(images)
|
||||
|
||||
def create_flat_toc(self, nodes, level):
|
||||
for item in nodes:
|
||||
href, mid, id = item.href.partition('#')
|
||||
if not id:
|
||||
self.toc[href] = 'page'
|
||||
else:
|
||||
if not self.toc.get(href, None):
|
||||
self.toc[href] = {}
|
||||
self.toc[href][id] = level
|
||||
self.create_flat_toc(item.nodes, level + 1)
|
||||
|
||||
def ensure_p(self):
|
||||
if self.in_p:
|
||||
return [], []
|
||||
@ -254,10 +298,38 @@ class FB2MLizer(object):
|
||||
# First tag in tree
|
||||
tag = barename(elem_tree.tag)
|
||||
|
||||
# Convert TOC entries to <title>s and add <section>s
|
||||
if self.opts.sectionize == 'toc':
|
||||
# A section cannot be a child of any other element than another section,
|
||||
# so leave the tag alone if there are parents
|
||||
if not tag_stack:
|
||||
# There are two reasons to start a new section here: the TOC pointed to
|
||||
# this page (then we use the first non-<body> on the page as a <title>), or
|
||||
# the TOC pointed to a specific element
|
||||
newlevel = 0
|
||||
toc_entry = self.toc.get(page.href, None)
|
||||
if toc_entry == 'page':
|
||||
if tag != 'body' and hasattr(elem_tree, 'text') and elem_tree.text:
|
||||
newlevel = 1
|
||||
self.toc[page.href] = None
|
||||
elif toc_entry and elem_tree.attrib.get('id', None):
|
||||
newlevel = toc_entry.get(elem_tree.attrib.get('id', None), None)
|
||||
|
||||
# Start a new section if necessary
|
||||
if newlevel:
|
||||
if not (newlevel > self.section_level):
|
||||
fb2_out.append('</section>')
|
||||
self.section_level -= 1
|
||||
fb2_out.append('<section>')
|
||||
self.section_level += 1
|
||||
fb2_out.append('<title>')
|
||||
tags.append('title')
|
||||
if self.section_level == 0:
|
||||
# If none of the prior processing made a section, make one now to be FB2 spec compliant
|
||||
fb2_out.append('<section>')
|
||||
self.section_level += 1
|
||||
|
||||
# Process the XHTML tag if it needs to be converted to an FB2 tag.
|
||||
if tag == 'h1' and self.opts.h1_to_title or tag == 'h2' and self.opts.h2_to_title or tag == 'h3' and self.opts.h3_to_title:
|
||||
fb2_out.append('<title>')
|
||||
tags.append('title')
|
||||
if tag == 'img':
|
||||
if elem_tree.attrib.get('src', None):
|
||||
# Only write the image tag if it is in the manifest.
|
||||
|
||||
@ -16,15 +16,15 @@ class FB2Output(OutputFormatPlugin):
|
||||
file_type = 'fb2'
|
||||
|
||||
options = set([
|
||||
OptionRecommendation(name='h1_to_title',
|
||||
recommended_value=False, level=OptionRecommendation.LOW,
|
||||
help=_('Wrap all h1 tags with fb2 title elements.')),
|
||||
OptionRecommendation(name='h2_to_title',
|
||||
recommended_value=False, level=OptionRecommendation.LOW,
|
||||
help=_('Wrap all h2 tags with fb2 title elements.')),
|
||||
OptionRecommendation(name='h3_to_title',
|
||||
recommended_value=False, level=OptionRecommendation.LOW,
|
||||
help=_('Wrap all h3 tags with fb2 title elements.')),
|
||||
OptionRecommendation(name='sectionize',
|
||||
recommended_value='files', level=OptionRecommendation.LOW,
|
||||
choices=['toc', 'files', 'nothing'],
|
||||
help=_('Specify the sectionization of elements. '
|
||||
'A value of "nothing" turns the book into a single section. '
|
||||
'A value of "files" turns each file into a separate section; use this if your device is having trouble. '
|
||||
'A value of "Table of Contents" turns the entries in the Table of Contents into titles and creates sections; '
|
||||
'if it fails, adjust the "Structure Detection" and/or "Table of Contents" settings '
|
||||
'(turn on "Force use of auto-generated Table of Contents).')),
|
||||
])
|
||||
|
||||
def convert(self, oeb_book, output_path, input_plugin, opts, log):
|
||||
|
||||
@ -55,8 +55,12 @@ except:
|
||||
|
||||
_ignore_starts = u'\'"'+u''.join(unichr(x) for x in range(0x2018, 0x201e)+[0x2032, 0x2033])
|
||||
|
||||
def title_sort(title):
|
||||
def title_sort(title, order=None):
|
||||
if order is None:
|
||||
order = tweaks['title_series_sorting']
|
||||
title = title.strip()
|
||||
if order == 'strictly_alphabetic':
|
||||
return title
|
||||
if title and title[0] in _ignore_starts:
|
||||
title = title[1:]
|
||||
match = _title_pat.search(title)
|
||||
|
||||
@ -463,6 +463,8 @@ class Metadata(object):
|
||||
other_lang = getattr(other, 'language', None)
|
||||
if other_lang and other_lang.lower() != 'und':
|
||||
self.language = other_lang
|
||||
if not getattr(self, 'series', None):
|
||||
self.series_index = None
|
||||
|
||||
def format_series_index(self, val=None):
|
||||
from calibre.ebooks.metadata import fmt_sidx
|
||||
|
||||
@ -11,12 +11,11 @@ import os, re, uuid, logging
|
||||
from mimetypes import types_map
|
||||
from collections import defaultdict
|
||||
from itertools import count
|
||||
from urlparse import urldefrag, urlparse, urlunparse
|
||||
from urlparse import urldefrag, urlparse, urlunparse, urljoin
|
||||
from urllib import unquote as urlunquote
|
||||
from urlparse import urljoin
|
||||
|
||||
from lxml import etree, html
|
||||
from cssutils import CSSParser
|
||||
from cssutils import CSSParser, parseString, parseStyle, replaceUrls
|
||||
from cssutils.css import CSSRule
|
||||
|
||||
import calibre
|
||||
@ -88,11 +87,11 @@ def XLINK(name):
|
||||
def CALIBRE(name):
|
||||
return '{%s}%s' % (CALIBRE_NS, name)
|
||||
|
||||
_css_url_re = re.compile(r'url\((.*?)\)', re.I)
|
||||
_css_url_re = re.compile(r'url\s*\((.*?)\)', re.I)
|
||||
_css_import_re = re.compile(r'@import "(.*?)"')
|
||||
_archive_re = re.compile(r'[^ ]+')
|
||||
|
||||
def iterlinks(root):
|
||||
def iterlinks(root, find_links_in_css=True):
|
||||
'''
|
||||
Iterate over all links in a OEB Document.
|
||||
|
||||
@ -134,6 +133,8 @@ def iterlinks(root):
|
||||
yield (el, attr, attribs[attr], 0)
|
||||
|
||||
|
||||
if not find_links_in_css:
|
||||
continue
|
||||
if tag == XHTML('style') and el.text:
|
||||
for match in _css_url_re.finditer(el.text):
|
||||
yield (el, None, match.group(1), match.start(1))
|
||||
@ -180,7 +181,7 @@ def rewrite_links(root, link_repl_func, resolve_base_href=False):
|
||||
'''
|
||||
if resolve_base_href:
|
||||
resolve_base_href(root)
|
||||
for el, attrib, link, pos in iterlinks(root):
|
||||
for el, attrib, link, pos in iterlinks(root, find_links_in_css=False):
|
||||
new_link = link_repl_func(link.strip())
|
||||
if new_link == link:
|
||||
continue
|
||||
@ -203,6 +204,40 @@ def rewrite_links(root, link_repl_func, resolve_base_href=False):
|
||||
new = cur[:pos] + new_link + cur[pos+len(link):]
|
||||
el.attrib[attrib] = new
|
||||
|
||||
def set_property(v):
|
||||
if v.CSS_PRIMITIVE_VALUE == v.cssValueType and \
|
||||
v.CSS_URI == v.primitiveType:
|
||||
v.setStringValue(v.CSS_URI,
|
||||
link_repl_func(v.getStringValue()))
|
||||
|
||||
for el in root.iter():
|
||||
try:
|
||||
tag = el.tag
|
||||
except UnicodeDecodeError:
|
||||
continue
|
||||
|
||||
if tag == XHTML('style') and el.text and \
|
||||
(_css_url_re.search(el.text) is not None or '@import' in
|
||||
el.text):
|
||||
stylesheet = parseString(el.text)
|
||||
replaceUrls(stylesheet, link_repl_func)
|
||||
el.text = '\n'+stylesheet.cssText + '\n'
|
||||
|
||||
if 'style' in el.attrib:
|
||||
text = el.attrib['style']
|
||||
if _css_url_re.search(text) is not None:
|
||||
stext = parseStyle(text)
|
||||
for p in stext.getProperties(all=True):
|
||||
v = p.cssValue
|
||||
if v.CSS_VALUE_LIST == v.cssValueType:
|
||||
for item in v:
|
||||
set_property(item)
|
||||
elif v.CSS_PRIMITIVE_VALUE == v.cssValueType:
|
||||
set_property(v)
|
||||
el.attrib['style'] = stext.cssText.replace('\n', ' ').replace('\r',
|
||||
' ')
|
||||
|
||||
|
||||
|
||||
EPUB_MIME = types_map['.epub']
|
||||
XHTML_MIME = types_map['.xhtml']
|
||||
@ -622,7 +657,10 @@ class Metadata(object):
|
||||
attrib[key] = prefixname(value, nsrmap)
|
||||
if namespace(self.term) == DC11_NS:
|
||||
elem = element(parent, self.term, attrib=attrib)
|
||||
elem.text = self.value
|
||||
try:
|
||||
elem.text = self.value
|
||||
except:
|
||||
elem.text = repr(self.value)
|
||||
else:
|
||||
elem = element(parent, OPF('meta'), attrib=attrib)
|
||||
elem.attrib['name'] = prefixname(self.term, nsrmap)
|
||||
|
||||
@ -257,7 +257,6 @@ class EbookIterator(object):
|
||||
s.max_page = s.start_page + s.pages - 1
|
||||
self.toc = self.opf.toc
|
||||
|
||||
self.find_embedded_fonts()
|
||||
self.read_bookmarks()
|
||||
|
||||
return self
|
||||
|
||||
@ -6,7 +6,7 @@ __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
import posixpath
|
||||
from urlparse import urldefrag
|
||||
from urlparse import urldefrag, urlparse
|
||||
|
||||
from lxml import etree
|
||||
import cssutils
|
||||
@ -67,6 +67,10 @@ class RenameFiles(object): # {{{
|
||||
|
||||
def url_replacer(self, orig_url):
|
||||
url = urlnormalize(orig_url)
|
||||
parts = urlparse(url)
|
||||
if parts.scheme:
|
||||
# Only rewrite local URLs
|
||||
return orig_url
|
||||
path, frag = urldefrag(url)
|
||||
if self.renamed_items_map:
|
||||
orig_item = self.renamed_items_map.get(self.current_item.href, self.current_item)
|
||||
|
||||
@ -72,8 +72,8 @@ class PML_HTMLizer(object):
|
||||
'ra': ('<span id="r%s"></span><a href="#%s">', '</a>'),
|
||||
'c': ('<div style="text-align: center; margin: auto;">', '</div>'),
|
||||
'r': ('<div style="text-align: right;">', '</div>'),
|
||||
't': ('<div style="text-indent: 5%;">', '</div>'),
|
||||
'T': ('<div style="text-indent: %s;">', '</div>'),
|
||||
't': ('<div style="margin-left: 5%;">', '</div>'),
|
||||
'T': ('<div style="margin-left: %s;">', '</div>'),
|
||||
'i': ('<span style="font-style: italic;">', '</span>'),
|
||||
'u': ('<span style="text-decoration: underline;">', '</span>'),
|
||||
'd': ('<span style="text-decoration: line-through;">', '</span>'),
|
||||
|
||||
@ -245,7 +245,7 @@ class RTFInput(InputFormatPlugin):
|
||||
from calibre.ebooks.metadata.meta import get_metadata
|
||||
from calibre.ebooks.metadata.opf2 import OPFCreator
|
||||
from calibre.ebooks.rtf2xml.ParseRtf import RtfInvalidCodeException
|
||||
self.options = options
|
||||
self.opts = options
|
||||
self.log = log
|
||||
self.log('Converting RTF to XML...')
|
||||
#Name of the preprocesssed RTF file
|
||||
@ -290,12 +290,12 @@ class RTFInput(InputFormatPlugin):
|
||||
res = transform.tostring(result)
|
||||
res = res[:100].replace('xmlns:html', 'xmlns') + res[100:]
|
||||
# Replace newlines inserted by the 'empty_paragraphs' option in rtf2xml with html blank lines
|
||||
if not getattr(self.options, 'remove_paragraph_spacing', False):
|
||||
if not getattr(self.opts, 'remove_paragraph_spacing', False):
|
||||
res = re.sub('\s*<body>', '<body>', res)
|
||||
res = re.sub('(?<=\n)\n{2}',
|
||||
u'<p>\u00a0</p>\n'.encode('utf-8'), res)
|
||||
if self.options.preprocess_html:
|
||||
preprocessor = PreProcessor(self.options, log=getattr(self, 'log', None))
|
||||
if self.opts.preprocess_html:
|
||||
preprocessor = PreProcessor(self.opts, log=getattr(self, 'log', None))
|
||||
res = preprocessor(res)
|
||||
f.write(res)
|
||||
self.write_inline_css(inline_class, border_styles)
|
||||
|
||||
@ -62,7 +62,7 @@ class SNBInput(InputFormatPlugin):
|
||||
oeb.uid = oeb.metadata.identifier[0]
|
||||
break
|
||||
|
||||
with TemporaryDirectory('_chm2oeb', keep=True) as tdir:
|
||||
with TemporaryDirectory('_snb2oeb', keep=True) as tdir:
|
||||
log.debug('Process TOC ...')
|
||||
toc = snbFile.GetFileStream('snbf/toc.snbf')
|
||||
oeb.container = DirContainer(tdir, log)
|
||||
@ -74,17 +74,18 @@ class SNBInput(InputFormatPlugin):
|
||||
chapterSrc = ch.get('src')
|
||||
fname = 'ch_%d.htm' % i
|
||||
data = snbFile.GetFileStream('snbc/' + chapterSrc)
|
||||
if data != None:
|
||||
snbc = etree.fromstring(data)
|
||||
outputFile = open(os.path.join(tdir, fname), 'wb')
|
||||
lines = []
|
||||
for line in snbc.find('.//body'):
|
||||
if line.tag == 'text':
|
||||
lines.append(u'<p>%s</p>' % html_encode(line.text))
|
||||
elif line.tag == 'img':
|
||||
lines.append(u'<p><img src="%s" /></p>' % html_encode(line.text))
|
||||
outputFile.write((HTML_TEMPLATE % (chapterName, u'\n'.join(lines))).encode('utf-8', 'replace'))
|
||||
outputFile.close()
|
||||
if data == None:
|
||||
continue
|
||||
snbc = etree.fromstring(data)
|
||||
outputFile = open(os.path.join(tdir, fname), 'wb')
|
||||
lines = []
|
||||
for line in snbc.find('.//body'):
|
||||
if line.tag == 'text':
|
||||
lines.append(u'<p>%s</p>' % html_encode(line.text))
|
||||
elif line.tag == 'img':
|
||||
lines.append(u'<p><img src="%s" /></p>' % html_encode(line.text))
|
||||
outputFile.write((HTML_TEMPLATE % (chapterName, u'\n'.join(lines))).encode('utf-8', 'replace'))
|
||||
outputFile.close()
|
||||
oeb.toc.add(ch.text, fname)
|
||||
id, href = oeb.manifest.generate(id='html',
|
||||
href=ascii_filename(fname))
|
||||
|
||||
@ -35,14 +35,17 @@ class SNBOutput(OutputFormatPlugin):
|
||||
recommended_value=False, level=OptionRecommendation.LOW,
|
||||
help=_('Specify whether or not to insert an empty line between '
|
||||
'two paragraphs.')),
|
||||
OptionRecommendation(name='snb_indent_first_line',
|
||||
recommended_value=True, level=OptionRecommendation.LOW,
|
||||
OptionRecommendation(name='snb_dont_indent_first_line',
|
||||
recommended_value=False, level=OptionRecommendation.LOW,
|
||||
help=_('Specify whether or not to insert two space characters '
|
||||
'to indent the first line of each paragraph.')),
|
||||
OptionRecommendation(name='snb_hide_chapter_name',
|
||||
recommended_value=False, level=OptionRecommendation.LOW,
|
||||
help=_('Specify whether or not to hide the chapter title for each '
|
||||
'chapter. Useful for image-only output (eg. comics).')),
|
||||
OptionRecommendation(name='snb_full_screen',
|
||||
recommended_value=False, level=OptionRecommendation.LOW,
|
||||
help=_('Resize all the images for full screen view. ')),
|
||||
])
|
||||
|
||||
def convert(self, oeb_book, output_path, input_plugin, opts, log):
|
||||
@ -228,7 +231,10 @@ class SNBOutput(OutputFormatPlugin):
|
||||
img.load(imageData)
|
||||
(x,y) = img.size
|
||||
if self.opts:
|
||||
SCREEN_X, SCREEN_Y = self.opts.output_profile.comic_screen_size
|
||||
if self.opts.snb_full_screen:
|
||||
SCREEN_X, SCREEN_Y = self.opts.output_profile.screen_size
|
||||
else:
|
||||
SCREEN_X, SCREEN_Y = self.opts.output_profile.comic_screen_size
|
||||
else:
|
||||
SCREEN_X = 540
|
||||
SCREEN_Y = 700
|
||||
|
||||
@ -121,7 +121,7 @@ class SNBMLizer(object):
|
||||
subitem = line[len(CALIBRE_SNB_BM_TAG):]
|
||||
bodyTree = trees[subitem].find(".//body")
|
||||
else:
|
||||
if self.opts and self.opts.snb_indent_first_line:
|
||||
if self.opts and not self.opts.snb_dont_indent_first_line:
|
||||
prefix = u'\u3000\u3000'
|
||||
else:
|
||||
prefix = u''
|
||||
|
||||
@ -83,7 +83,7 @@ def _config():
|
||||
c.add_opt('LRF_ebook_viewer_options', default=None,
|
||||
help=_('Options for the LRF ebook viewer'))
|
||||
c.add_opt('internally_viewed_formats', default=['LRF', 'EPUB', 'LIT',
|
||||
'MOBI', 'PRC', 'HTML', 'FB2', 'PDB', 'RB'],
|
||||
'MOBI', 'PRC', 'HTML', 'FB2', 'PDB', 'RB', 'SNB'],
|
||||
help=_('Formats that are viewed using the internal viewer'))
|
||||
c.add_opt('column_map', default=ALL_COLUMNS,
|
||||
help=_('Columns to be displayed in the book list'))
|
||||
|
||||
@ -138,6 +138,10 @@ class CheckIntegrity(QProgressDialog):
|
||||
'You should check them manually. This can '
|
||||
'happen if you manipulate the files in the '
|
||||
'library folder directly.'), det_msg=det_msg, show=True)
|
||||
else:
|
||||
info_dialog(self, _('No errors found'),
|
||||
_('The integrity check completed with no uncorrectable errors found.'),
|
||||
show=True)
|
||||
self.reset()
|
||||
|
||||
# }}}
|
||||
@ -162,6 +166,7 @@ class ChooseLibraryAction(InterfaceAction):
|
||||
self.choose_menu = QMenu(self.gui)
|
||||
self.qaction.setMenu(self.choose_menu)
|
||||
|
||||
|
||||
if not os.environ.get('CALIBRE_OVERRIDE_DATABASE_PATH', None):
|
||||
self.choose_menu.addAction(self.action_choose)
|
||||
|
||||
@ -172,6 +177,11 @@ class ChooseLibraryAction(InterfaceAction):
|
||||
self.delete_menu = QMenu(_('Delete library'))
|
||||
self.delete_menu_action = self.choose_menu.addMenu(self.delete_menu)
|
||||
|
||||
ac = self.create_action(spec=(_('Pick a random book'), 'catalog.png',
|
||||
None, None), attr='action_pick_random')
|
||||
ac.triggered.connect(self.pick_random)
|
||||
self.choose_menu.addAction(ac)
|
||||
|
||||
self.rename_separator = self.choose_menu.addSeparator()
|
||||
|
||||
self.switch_actions = []
|
||||
@ -209,6 +219,12 @@ class ChooseLibraryAction(InterfaceAction):
|
||||
self.maintenance_menu.addAction(ac)
|
||||
self.choose_menu.addMenu(self.maintenance_menu)
|
||||
|
||||
def pick_random(self, *args):
|
||||
import random
|
||||
pick = random.randint(0, self.gui.library_view.model().rowCount(None))
|
||||
self.gui.library_view.set_current_row(pick)
|
||||
self.gui.library_view.scroll_to_row(pick)
|
||||
|
||||
def library_name(self):
|
||||
db = self.gui.library_view.model().db
|
||||
path = db.library_path
|
||||
|
||||
@ -12,6 +12,7 @@ from PyQt4.Qt import QMenu, QObject, QTimer
|
||||
from calibre.gui2 import error_dialog
|
||||
from calibre.gui2.dialogs.delete_matching_from_device import DeleteMatchingFromDeviceDialog
|
||||
from calibre.gui2.dialogs.confirm_delete import confirm
|
||||
from calibre.gui2.dialogs.confirm_delete_location import confirm_location
|
||||
from calibre.gui2.actions import InterfaceAction
|
||||
|
||||
single_shot = partial(QTimer.singleShot, 10)
|
||||
@ -96,10 +97,15 @@ class DeleteAction(InterfaceAction):
|
||||
for action in list(self.delete_menu.actions())[1:]:
|
||||
action.setEnabled(enabled)
|
||||
|
||||
def _get_selected_formats(self, msg):
|
||||
def _get_selected_formats(self, msg, ids):
|
||||
from calibre.gui2.dialogs.select_formats import SelectFormats
|
||||
fmts = self.gui.library_view.model().db.all_formats()
|
||||
d = SelectFormats([x.lower() for x in fmts], msg, parent=self.gui)
|
||||
fmts = set([])
|
||||
db = self.gui.library_view.model().db
|
||||
for x in ids:
|
||||
fmts_ = db.formats(x, index_is_id=True, verify_formats=False)
|
||||
if fmts_:
|
||||
fmts.update(frozenset([x.lower() for x in fmts_.split(',')]))
|
||||
d = SelectFormats(list(sorted(fmts)), msg, parent=self.gui)
|
||||
if d.exec_() != d.Accepted:
|
||||
return None
|
||||
return d.selected_formats
|
||||
@ -117,7 +123,7 @@ class DeleteAction(InterfaceAction):
|
||||
if not ids:
|
||||
return
|
||||
fmts = self._get_selected_formats(
|
||||
_('Choose formats to be deleted'))
|
||||
_('Choose formats to be deleted'), ids)
|
||||
if not fmts:
|
||||
return
|
||||
for id in ids:
|
||||
@ -135,7 +141,7 @@ class DeleteAction(InterfaceAction):
|
||||
if not ids:
|
||||
return
|
||||
fmts = self._get_selected_formats(
|
||||
'<p>'+_('Choose formats <b>not</b> to be deleted'))
|
||||
'<p>'+_('Choose formats <b>not</b> to be deleted'), ids)
|
||||
if fmts is None:
|
||||
return
|
||||
for id in ids:
|
||||
@ -223,7 +229,31 @@ class DeleteAction(InterfaceAction):
|
||||
rows = view.selectionModel().selectedRows()
|
||||
if not rows or len(rows) == 0:
|
||||
return
|
||||
# Library view is visible.
|
||||
if self.gui.stack.currentIndex() == 0:
|
||||
# Ask the user if they want to delete the book from the library or device if it is in both.
|
||||
if self.gui.device_manager.is_device_connected:
|
||||
on_device = False
|
||||
on_device_ids = self._get_selected_ids()
|
||||
for id in on_device_ids:
|
||||
res = self.gui.book_on_device(id)
|
||||
if res[0] or res[1] or res[2]:
|
||||
on_device = True
|
||||
if on_device:
|
||||
break
|
||||
if on_device:
|
||||
loc = confirm_location('<p>' + _('Some of the selected books are on the attached device. '
|
||||
'<b>Where</b> do you want the selected files deleted from?'),
|
||||
self.gui)
|
||||
if not loc:
|
||||
return
|
||||
elif loc == 'dev':
|
||||
self.remove_matching_books_from_device()
|
||||
return
|
||||
elif loc == 'both':
|
||||
self.remove_matching_books_from_device()
|
||||
# The following will run if the selected books are not on a connected device.
|
||||
# The user has selected to delete from the library or the device and library.
|
||||
if not confirm('<p>'+_('The selected books will be '
|
||||
'<b>permanently deleted</b> and the files '
|
||||
'removed from your calibre library. Are you sure?')
|
||||
@ -239,7 +269,7 @@ class DeleteAction(InterfaceAction):
|
||||
else:
|
||||
self.__md = MultiDeleter(self.gui, rows,
|
||||
partial(self.library_ids_deleted, current_row=row))
|
||||
|
||||
# Device view is visible.
|
||||
else:
|
||||
if not confirm('<p>'+_('The selected books will be '
|
||||
'<b>permanently deleted</b> '
|
||||
|
||||
@ -249,7 +249,7 @@ class BookInfo(QWebView):
|
||||
left_pane = u'<table>%s</table>'%rows
|
||||
right_pane = u'<div>%s</div>'%comments
|
||||
self.setHtml(templ%(u'<table><tr><td valign="top" '
|
||||
'style="padding-right:2em">%s</td><td valign="top">%s</td></tr></table>'
|
||||
'style="padding-right:2em; width:40%%">%s</td><td valign="top">%s</td></tr></table>'
|
||||
% (left_pane, right_pane)))
|
||||
|
||||
def mouseDoubleClickEvent(self, ev):
|
||||
|
||||
@ -5,44 +5,217 @@ __license__ = 'GPL v3'
|
||||
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
import re, os
|
||||
|
||||
from lxml import html
|
||||
from lxml.html import soupparser
|
||||
|
||||
from PyQt4.Qt import QApplication, QFontInfo, QPalette, QSize, QWidget, \
|
||||
QToolBar, QVBoxLayout, QAction, QIcon
|
||||
from PyQt4.QtWebKit import QWebView
|
||||
from PyQt4.Qt import QApplication, QFontInfo, QSize, QWidget, QPlainTextEdit, \
|
||||
QToolBar, QVBoxLayout, QAction, QIcon, Qt, QTabWidget, QUrl, \
|
||||
QSyntaxHighlighter, QColor, QChar, QColorDialog, QMenu, QInputDialog
|
||||
from PyQt4.QtWebKit import QWebView, QWebPage
|
||||
|
||||
from calibre.ebooks.chardet import xml_to_unicode
|
||||
from calibre import xml_replace_entities
|
||||
from calibre.gui2 import open_url
|
||||
|
||||
class EditorWidget(QWebView):
|
||||
class PageAction(QAction): # {{{
|
||||
|
||||
def __init__(self, wac, icon, text, checkable, view):
|
||||
QAction.__init__(self, QIcon(I(icon+'.png')), text, view)
|
||||
self._page_action = getattr(QWebPage, wac)
|
||||
self.setCheckable(checkable)
|
||||
self.triggered.connect(self.trigger_page_action)
|
||||
view.selectionChanged.connect(self.update_state,
|
||||
type=Qt.QueuedConnection)
|
||||
self.page_action.changed.connect(self.update_state,
|
||||
type=Qt.QueuedConnection)
|
||||
|
||||
@property
|
||||
def page_action(self):
|
||||
return self.parent().pageAction(self._page_action)
|
||||
|
||||
def trigger_page_action(self, *args):
|
||||
self.page_action.trigger()
|
||||
|
||||
def update_state(self, *args):
|
||||
if self.isCheckable():
|
||||
self.setChecked(self.page_action.isChecked())
|
||||
self.setEnabled(self.page_action.isEnabled())
|
||||
|
||||
# }}}
|
||||
|
||||
class BlockStyleAction(QAction): # {{{
|
||||
|
||||
def __init__(self, text, name, view):
|
||||
QAction.__init__(self, text, view)
|
||||
self._name = name
|
||||
self.triggered.connect(self.apply_style)
|
||||
|
||||
def apply_style(self, *args):
|
||||
self.parent().exec_command('formatBlock', self._name)
|
||||
|
||||
# }}}
|
||||
|
||||
class EditorWidget(QWebView): # {{{
|
||||
|
||||
def __init__(self, parent=None):
|
||||
QWebView.__init__(self, parent)
|
||||
|
||||
for name, icon, text, checkable in [
|
||||
('bold', 'format-text-bold', _('Bold'), True),
|
||||
('italic', 'format-text-italic', _('Italic'), True),
|
||||
('underline', 'format-text-underline', _('Underline'), True),
|
||||
('strikethrough', 'format-text-underline', _('Underline'), True),
|
||||
self.comments_pat = re.compile(r'<!--.*?-->', re.DOTALL)
|
||||
|
||||
for wac, name, icon, text, checkable in [
|
||||
('ToggleBold', 'bold', 'format-text-bold', _('Bold'), True),
|
||||
('ToggleItalic', 'italic', 'format-text-italic', _('Italic'),
|
||||
True),
|
||||
('ToggleUnderline', 'underline', 'format-text-underline',
|
||||
_('Underline'), True),
|
||||
('ToggleStrikethrough', 'strikethrough', 'format-text-strikethrough',
|
||||
_('Strikethrough'), True),
|
||||
('ToggleSuperscript', 'superscript', 'format-text-superscript',
|
||||
_('Superscript'), True),
|
||||
('ToggleSubscript', 'subscript', 'format-text-subscript',
|
||||
_('Subscript'), True),
|
||||
('InsertOrderedList', 'ordered_list', 'format-list-ordered',
|
||||
_('Ordered list'), True),
|
||||
('InsertUnorderedList', 'unordered_list', 'format-list-unordered',
|
||||
_('Unordered list'), True),
|
||||
|
||||
('AlignLeft', 'align_left', 'format-justify-left',
|
||||
_('Align left'), False),
|
||||
('AlignCenter', 'align_center', 'format-justify-center',
|
||||
_('Align center'), False),
|
||||
('AlignRight', 'align_right', 'format-justify-right',
|
||||
_('Align right'), False),
|
||||
('AlignJustified', 'align_justified', 'format-justify-fill',
|
||||
_('Align justified'), False),
|
||||
('Undo', 'undo', 'edit-undo', _('Undo'), False),
|
||||
('Redo', 'redo', 'edit-redo', _('Redo'), False),
|
||||
('RemoveFormat', 'remove_format', 'trash', _('Remove formatting'), False),
|
||||
('Copy', 'copy', 'edit-copy', _('Copy'), False),
|
||||
('Paste', 'paste', 'edit-paste', _('Paste'), False),
|
||||
('Cut', 'cut', 'edit-cut', _('Cut'), False),
|
||||
('Indent', 'indent', 'format-indent-more',
|
||||
_('Increase Indentation'), False),
|
||||
('Outdent', 'outdent', 'format-indent-less',
|
||||
_('Decrease Indentation'), False),
|
||||
('SelectAll', 'select_all', 'edit-select-all',
|
||||
_('Select all'), False),
|
||||
]:
|
||||
ac = QAction(QIcon(I(icon+'.png')), text, self)
|
||||
ac.setCheckable(checkable)
|
||||
ac = PageAction(wac, icon, text, checkable, self)
|
||||
setattr(self, 'action_'+name, ac)
|
||||
|
||||
self.action_color = QAction(QIcon(I('format-text-color')), _('Foreground color'),
|
||||
self)
|
||||
self.action_color.triggered.connect(self.foreground_color)
|
||||
|
||||
self.action_background = QAction(QIcon(I('format-fill-color')),
|
||||
_('Background color'), self)
|
||||
self.action_background.triggered.connect(self.background_color)
|
||||
|
||||
self.action_block_style = QAction(QIcon(I('format-text-heading')),
|
||||
_('Style text block'), self)
|
||||
self.action_block_style.setToolTip(
|
||||
_('Style the selected text block'))
|
||||
self.block_style_menu = QMenu(self)
|
||||
self.action_block_style.setMenu(self.block_style_menu)
|
||||
self.block_style_actions = []
|
||||
for text, name in [
|
||||
(_('Normal'), 'p'),
|
||||
(_('Heading') +' 1', 'h1'),
|
||||
(_('Heading') +' 2', 'h2'),
|
||||
(_('Heading') +' 3', 'h3'),
|
||||
(_('Heading') +' 4', 'h4'),
|
||||
(_('Heading') +' 5', 'h5'),
|
||||
(_('Heading') +' 6', 'h6'),
|
||||
(_('Pre-formatted'), 'pre'),
|
||||
(_('Blockquote'), 'blockquote'),
|
||||
(_('Address'), 'address'),
|
||||
]:
|
||||
ac = BlockStyleAction(text, name, self)
|
||||
self.block_style_menu.addAction(ac)
|
||||
self.block_style_actions.append(ac)
|
||||
|
||||
self.action_insert_link = QAction(QIcon(I('insert-link.png')),
|
||||
_('Insert link'), self)
|
||||
self.action_insert_link.triggered.connect(self.insert_link)
|
||||
|
||||
self.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
|
||||
self.page().linkClicked.connect(self.link_clicked)
|
||||
|
||||
self.setHtml('')
|
||||
self.page().setContentEditable(True)
|
||||
|
||||
def link_clicked(self, url):
|
||||
open_url(url)
|
||||
|
||||
def foreground_color(self):
|
||||
col = QColorDialog.getColor(Qt.black, self,
|
||||
_('Choose foreground color'), QColorDialog.ShowAlphaChannel)
|
||||
if col.isValid():
|
||||
self.exec_command('foreColor', unicode(col.name()))
|
||||
|
||||
def background_color(self):
|
||||
col = QColorDialog.getColor(Qt.white, self,
|
||||
_('Choose background color'), QColorDialog.ShowAlphaChannel)
|
||||
if col.isValid():
|
||||
self.exec_command('hiliteColor', unicode(col.name()))
|
||||
|
||||
def insert_link(self, *args):
|
||||
link, ok = QInputDialog.getText(self, _('Create link'),
|
||||
_('Enter URL'))
|
||||
if not ok:
|
||||
return
|
||||
url = self.parse_link(unicode(link))
|
||||
if url.isValid():
|
||||
url = unicode(url.toString())
|
||||
self.exec_command('createLink', url)
|
||||
|
||||
def parse_link(self, link):
|
||||
link = link.strip()
|
||||
has_schema = re.match(r'^[a-zA-Z]+:', link)
|
||||
if has_schema is not None:
|
||||
url = QUrl(link, QUrl.TolerantMode)
|
||||
if url.isValid():
|
||||
return url
|
||||
if os.path.exists(link):
|
||||
return QUrl.fromLocalFile(link)
|
||||
|
||||
if has_schema is None:
|
||||
first, _, rest = link.partition('.')
|
||||
prefix = 'http'
|
||||
if first == 'ftp':
|
||||
prefix = 'ftp'
|
||||
url = QUrl(prefix +'://'+link, QUrl.TolerantMode)
|
||||
if url.isValid():
|
||||
return url
|
||||
|
||||
return QUrl(link, QUrl.TolerantMode)
|
||||
|
||||
def sizeHint(self):
|
||||
return QSize(150, 150)
|
||||
|
||||
def exec_command(self, cmd, arg=None):
|
||||
frame = self.page().mainFrame()
|
||||
if arg is not None:
|
||||
js = 'document.execCommand("%s", false, "%s");' % (cmd, arg)
|
||||
else:
|
||||
js = 'document.execCommand("%s", false, null);' % cmd
|
||||
frame.evaluateJavaScript(js)
|
||||
|
||||
@dynamic_property
|
||||
def html(self):
|
||||
|
||||
def fget(self):
|
||||
ans = u''
|
||||
check = unicode(self.page().mainFrame().toPlainText()).strip()
|
||||
if not check:
|
||||
return ans
|
||||
try:
|
||||
raw = unicode(self.page().mainFrame().toHtml())
|
||||
raw = xml_to_unicode(raw, strip_encoding_pats=True,
|
||||
resolve_entities=True)[0]
|
||||
raw = self.comments_pat.sub('', raw)
|
||||
|
||||
try:
|
||||
root = html.fromstring(raw)
|
||||
@ -51,8 +224,11 @@ class EditorWidget(QWebView):
|
||||
|
||||
elems = []
|
||||
for body in root.xpath('//body'):
|
||||
if body.text:
|
||||
elems.append('<p>%s</p>'%body.text)
|
||||
elems += [html.tostring(x, encoding=unicode) for x in body if
|
||||
x.tag != 'script']
|
||||
x.tag not in ('script', 'style')]
|
||||
|
||||
if len(elems) > 1:
|
||||
ans = u'<div>%s</div>'%(u''.join(elems))
|
||||
else:
|
||||
@ -67,12 +243,7 @@ class EditorWidget(QWebView):
|
||||
def fset(self, val):
|
||||
self.setHtml(val)
|
||||
f = QFontInfo(QApplication.font(self)).pixelSize()
|
||||
b = unicode(QApplication.palette().color(QPalette.Normal,
|
||||
QPalette.Base).name())
|
||||
c = unicode(QApplication.palette().color(QPalette.Normal,
|
||||
QPalette.Text).name())
|
||||
style = 'font-size: %dpx; background-color: %s; color: %s' % (f, b,
|
||||
c)
|
||||
style = 'font-size: %dpx;' % (f,)
|
||||
|
||||
for body in self.page().mainFrame().documentElement().findAll('body'):
|
||||
body.setAttribute('style', style)
|
||||
@ -80,26 +251,316 @@ class EditorWidget(QWebView):
|
||||
|
||||
return property(fget=fget, fset=fset)
|
||||
|
||||
# }}}
|
||||
|
||||
class Editor(QWidget):
|
||||
# Highlighter {{{
|
||||
State_Text = -1
|
||||
State_DocType = 0
|
||||
State_Comment = 1
|
||||
State_TagStart = 2
|
||||
State_TagName = 3
|
||||
State_InsideTag = 4
|
||||
State_AttributeName = 5
|
||||
State_SingleQuote = 6
|
||||
State_DoubleQuote = 7
|
||||
State_AttributeValue = 8
|
||||
|
||||
class Highlighter(QSyntaxHighlighter):
|
||||
|
||||
def __init__(self, doc):
|
||||
QSyntaxHighlighter.__init__(self, doc)
|
||||
self.colors = {}
|
||||
self.colors['doctype'] = QColor(192, 192, 192)
|
||||
self.colors['entity'] = QColor(128, 128, 128)
|
||||
self.colors['tag'] = QColor(136, 18, 128)
|
||||
self.colors['comment'] = QColor( 35, 110, 37)
|
||||
self.colors['attrname'] = QColor(153, 69, 0)
|
||||
self.colors['attrval'] = QColor( 36, 36, 170)
|
||||
|
||||
def highlightBlock(self, text):
|
||||
state = self.previousBlockState()
|
||||
len_ = text.length()
|
||||
start = 0
|
||||
pos = 0
|
||||
|
||||
while pos < len_:
|
||||
|
||||
if state == State_Comment:
|
||||
start = pos
|
||||
while pos < len_:
|
||||
if text.mid(pos, 3) == "-->":
|
||||
pos += 3;
|
||||
state = State_Text;
|
||||
break
|
||||
else:
|
||||
pos += 1
|
||||
self.setFormat(start, pos - start, self.colors['comment'])
|
||||
|
||||
elif state == State_DocType:
|
||||
start = pos
|
||||
while pos < len_:
|
||||
ch = text.at(pos)
|
||||
pos += 1
|
||||
if ch == QChar('>'):
|
||||
state = State_Text
|
||||
break
|
||||
self.setFormat(start, pos - start, self.colors['doctype'])
|
||||
|
||||
# at '<' in e.g. "<span>foo</span>"
|
||||
elif state == State_TagStart:
|
||||
start = pos + 1
|
||||
while pos < len_:
|
||||
ch = text.at(pos)
|
||||
pos += 1
|
||||
if ch == QChar('>'):
|
||||
state = State_Text
|
||||
break
|
||||
if not ch.isSpace():
|
||||
pos -= 1
|
||||
state = State_TagName
|
||||
break
|
||||
|
||||
# at 'b' in e.g "<blockquote>foo</blockquote>"
|
||||
elif state == State_TagName:
|
||||
start = pos
|
||||
while pos < len_:
|
||||
ch = text.at(pos)
|
||||
pos += 1
|
||||
if ch.isSpace():
|
||||
pos -= 1
|
||||
state = State_InsideTag
|
||||
break
|
||||
if ch == QChar('>'):
|
||||
state = State_Text
|
||||
break
|
||||
self.setFormat(start, pos - start, self.colors['tag']);
|
||||
|
||||
# anywhere after tag name and before tag closing ('>')
|
||||
elif state == State_InsideTag:
|
||||
start = pos
|
||||
|
||||
while pos < len_:
|
||||
ch = text.at(pos)
|
||||
pos += 1
|
||||
|
||||
if ch == QChar('/'):
|
||||
continue
|
||||
|
||||
if ch == QChar('>'):
|
||||
state = State_Text
|
||||
break
|
||||
|
||||
if not ch.isSpace():
|
||||
pos -= 1
|
||||
state = State_AttributeName
|
||||
break
|
||||
|
||||
# at 's' in e.g. <img src=bla.png/>
|
||||
elif state == State_AttributeName:
|
||||
start = pos
|
||||
|
||||
while pos < len_:
|
||||
ch = text.at(pos)
|
||||
pos += 1
|
||||
|
||||
if ch == QChar('='):
|
||||
state = State_AttributeValue
|
||||
break
|
||||
|
||||
if ch in (QChar('>'), QChar('/')):
|
||||
state = State_InsideTag
|
||||
break
|
||||
|
||||
self.setFormat(start, pos - start, self.colors['attrname'])
|
||||
|
||||
# after '=' in e.g. <img src=bla.png/>
|
||||
elif state == State_AttributeValue:
|
||||
start = pos
|
||||
|
||||
# find first non-space character
|
||||
while pos < len_:
|
||||
ch = text.at(pos)
|
||||
pos += 1
|
||||
|
||||
# handle opening single quote
|
||||
if ch == QChar("'"):
|
||||
state = State_SingleQuote
|
||||
break
|
||||
|
||||
# handle opening double quote
|
||||
if ch == QChar('"'):
|
||||
state = State_DoubleQuote
|
||||
break
|
||||
|
||||
if not ch.isSpace():
|
||||
break
|
||||
|
||||
if state == State_AttributeValue:
|
||||
# attribute value without quote
|
||||
# just stop at non-space or tag delimiter
|
||||
start = pos
|
||||
while pos < len_:
|
||||
ch = text.at(pos);
|
||||
if ch.isSpace():
|
||||
break
|
||||
if ch in (QChar('>'), QChar('/')):
|
||||
break
|
||||
pos += 1
|
||||
state = State_InsideTag
|
||||
self.setFormat(start, pos - start, self.colors['attrval'])
|
||||
|
||||
# after the opening single quote in an attribute value
|
||||
elif state == State_SingleQuote:
|
||||
start = pos
|
||||
|
||||
while pos < len_:
|
||||
ch = text.at(pos)
|
||||
pos += 1
|
||||
if ch == QChar("'"):
|
||||
break
|
||||
|
||||
state = State_InsideTag
|
||||
|
||||
self.setFormat(start, pos - start, self.colors['attrval'])
|
||||
|
||||
# after the opening double quote in an attribute value
|
||||
elif state == State_DoubleQuote:
|
||||
start = pos
|
||||
|
||||
while pos < len_:
|
||||
ch = text.at(pos)
|
||||
pos += 1
|
||||
if ch == QChar('"'):
|
||||
break
|
||||
|
||||
state = State_InsideTag
|
||||
|
||||
self.setFormat(start, pos - start, self.colors['attrval'])
|
||||
|
||||
else:
|
||||
# State_Text and default
|
||||
while pos < len_:
|
||||
ch = text.at(pos)
|
||||
if ch == QChar('<'):
|
||||
if text.mid(pos, 4) == "<!--":
|
||||
state = State_Comment
|
||||
else:
|
||||
if text.mid(pos, 9).toUpper() == "<!DOCTYPE":
|
||||
state = State_DocType
|
||||
else:
|
||||
state = State_TagStart
|
||||
break;
|
||||
elif ch == QChar('&'):
|
||||
start = pos
|
||||
while pos < len_ and text.at(pos) != QChar(';'):
|
||||
self.setFormat(start, pos - start,
|
||||
self.colors['entity'])
|
||||
pos += 1
|
||||
|
||||
else:
|
||||
pos += 1
|
||||
|
||||
|
||||
self.setCurrentBlockState(state)
|
||||
|
||||
# }}}
|
||||
|
||||
class Editor(QWidget): # {{{
|
||||
|
||||
def __init__(self, parent=None):
|
||||
QWidget.__init__(self, parent)
|
||||
self.toolbar = QToolBar(self)
|
||||
self.toolbar1 = QToolBar(self)
|
||||
self.toolbar2 = QToolBar(self)
|
||||
self.editor = EditorWidget(self)
|
||||
self.tabs = QTabWidget(self)
|
||||
self.tabs.setTabPosition(self.tabs.South)
|
||||
self.wyswyg = QWidget(self.tabs)
|
||||
self.code_edit = QPlainTextEdit(self.tabs)
|
||||
self.source_dirty = False
|
||||
self.wyswyg_dirty = True
|
||||
|
||||
self._layout = QVBoxLayout(self)
|
||||
self.wyswyg.layout = l = QVBoxLayout(self.wyswyg)
|
||||
self.setLayout(self._layout)
|
||||
self._layout.setContentsMargins(0, 0, 0, 0)
|
||||
self._layout.addWidget(self.toolbar)
|
||||
self._layout.addWidget(self.editor)
|
||||
l.setContentsMargins(0, 0, 0, 0)
|
||||
l.addWidget(self.toolbar1)
|
||||
l.addWidget(self.toolbar2)
|
||||
l.addWidget(self.editor)
|
||||
self._layout.addWidget(self.tabs)
|
||||
self.tabs.addTab(self.wyswyg, _('Normal view'))
|
||||
self.tabs.addTab(self.code_edit, _('HTML Source'))
|
||||
self.tabs.currentChanged[int].connect(self.change_tab)
|
||||
self.highlighter = Highlighter(self.code_edit.document())
|
||||
|
||||
for x in ('bold', 'italic', 'underline', 'strikethrough',
|
||||
'superscript', 'subscript', 'indent', 'outdent'):
|
||||
ac = getattr(self.editor, 'action_'+x)
|
||||
if x in ('superscript', 'indent'):
|
||||
self.toolbar2.addSeparator()
|
||||
self.toolbar2.addAction(ac)
|
||||
self.toolbar2.addSeparator()
|
||||
|
||||
for x in ('left', 'center', 'right', 'justified'):
|
||||
ac = getattr(self.editor, 'action_align_'+x)
|
||||
self.toolbar2.addAction(ac)
|
||||
self.toolbar2.addSeparator()
|
||||
|
||||
self.toolbar1.addAction(self.editor.action_undo)
|
||||
self.toolbar1.addAction(self.editor.action_redo)
|
||||
self.toolbar1.addAction(self.editor.action_select_all)
|
||||
self.toolbar1.addAction(self.editor.action_remove_format)
|
||||
self.toolbar1.addSeparator()
|
||||
|
||||
for x in ('copy', 'cut', 'paste'):
|
||||
ac = getattr(self.editor, 'action_'+x)
|
||||
self.toolbar1.addAction(ac)
|
||||
self.toolbar1.addSeparator()
|
||||
|
||||
for x in ('', 'un'):
|
||||
ac = getattr(self.editor, 'action_%sordered_list'%x)
|
||||
self.toolbar1.addAction(ac)
|
||||
self.toolbar1.addSeparator()
|
||||
|
||||
self.toolbar1.addAction(self.editor.action_color)
|
||||
self.toolbar1.addAction(self.editor.action_background)
|
||||
self.toolbar1.addSeparator()
|
||||
|
||||
self.toolbar1.addAction(self.editor.action_block_style)
|
||||
w = self.toolbar1.widgetForAction(self.editor.action_block_style)
|
||||
w.setPopupMode(w.InstantPopup)
|
||||
self.toolbar1.addAction(self.editor.action_insert_link)
|
||||
|
||||
self.code_edit.textChanged.connect(self.code_dirtied)
|
||||
self.editor.page().contentsChanged.connect(self.wyswyg_dirtied)
|
||||
|
||||
@dynamic_property
|
||||
def html(self):
|
||||
def fset(self, v):
|
||||
self.editor.html = v
|
||||
return property(fget=lambda self:self.editor.html, fset=fset)
|
||||
def fget(self):
|
||||
self.tabs.setCurrentIndex(0)
|
||||
return self.editor.html
|
||||
return property(fget=fget, fset=fset)
|
||||
|
||||
def change_tab(self, index):
|
||||
#print 'reloading:', (index and self.wyswyg_dirty) or (not index and
|
||||
# self.source_dirty)
|
||||
if index == 1: # changing to code view
|
||||
if self.wyswyg_dirty:
|
||||
self.code_edit.setPlainText(self.editor.html)
|
||||
self.wyswyg_dirty = False
|
||||
elif index == 0: #changing to wyswyg
|
||||
if self.source_dirty:
|
||||
self.editor.html = unicode(self.code_edit.toPlainText())
|
||||
self.source_dirty = False
|
||||
|
||||
def wyswyg_dirtied(self, *args):
|
||||
self.wyswyg_dirty = True
|
||||
|
||||
def code_dirtied(self, *args):
|
||||
self.source_dirty = True
|
||||
|
||||
# }}}
|
||||
|
||||
if __name__ == '__main__':
|
||||
app = QApplication([])
|
||||
|
||||
@ -17,6 +17,8 @@ class PluginWidget(Widget, Ui_Form):
|
||||
ICON = I('mimetypes/fb2.png')
|
||||
|
||||
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
|
||||
Widget.__init__(self, parent, ['h1_to_title', 'h2_to_title', 'h3_to_title'])
|
||||
Widget.__init__(self, parent, ['sectionize'])
|
||||
self.db, self.book_id = db, book_id
|
||||
for x in ('toc', 'files', 'nothing'):
|
||||
self.opt_sectionize.addItem(x)
|
||||
self.initialize_options(get_option, get_help, db, book_id)
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="3" column="0">
|
||||
<item row="1" column="0">
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
@ -28,23 +28,19 @@
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QCheckBox" name="opt_h1_to_title">
|
||||
<property name="text">
|
||||
<string>Wrap h1 tags with <title> elements</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QCheckBox" name="opt_h2_to_title">
|
||||
<property name="text">
|
||||
<string>Wrap h2 tags with <title> elements</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QCheckBox" name="opt_h3_to_title">
|
||||
<property name="text">
|
||||
<string>Wrap h3 tags with <title> elements</string>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Sectionize:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>opt_sectionize</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QComboBox" name="opt_sectionize">
|
||||
<property name="minimumContentsLength">
|
||||
<number>20</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -11,7 +11,6 @@ from PyQt4.Qt import Qt
|
||||
from calibre.gui2.convert.mobi_output_ui import Ui_Form
|
||||
from calibre.gui2.convert import Widget
|
||||
from calibre.gui2.widgets import FontFamilyModel
|
||||
from calibre.utils.fonts import fontconfig
|
||||
|
||||
font_family_model = None
|
||||
|
||||
@ -28,6 +27,7 @@ class PluginWidget(Widget, Ui_Form):
|
||||
'mobi_ignore_margins',
|
||||
'dont_compress', 'no_inline_toc', 'masthead_font','personal_doc']
|
||||
)
|
||||
from calibre.utils.fonts import fontconfig
|
||||
self.db, self.book_id = db, book_id
|
||||
|
||||
global font_family_model
|
||||
|
||||
@ -18,8 +18,8 @@ class PluginWidget(Widget, Ui_Form):
|
||||
|
||||
def __init__(self, parent, get_option, get_help, db=None, book_id=None):
|
||||
Widget.__init__(self, parent,
|
||||
['snb_insert_empty_line', 'snb_indent_first_line',
|
||||
'snb_hide_chapter_name',])
|
||||
['snb_insert_empty_line', 'snb_dont_indent_first_line',
|
||||
'snb_hide_chapter_name','snb_full_screen'])
|
||||
self.db, self.book_id = db, book_id
|
||||
self.initialize_options(get_option, get_help, db, book_id)
|
||||
|
||||
|
||||
@ -13,8 +13,8 @@
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0">
|
||||
<item row="4" column="0">
|
||||
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0" rowminimumheight="0,0,0,0,0,0">
|
||||
<item row="5" column="0">
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
@ -35,9 +35,9 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QCheckBox" name="opt_snb_indent_first_line">
|
||||
<widget class="QCheckBox" name="opt_snb_dont_indent_first_line">
|
||||
<property name="text">
|
||||
<string>Insert space before the first line for each paragraph</string>
|
||||
<string>Don't indent the first line for each paragraph</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -48,6 +48,13 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QCheckBox" name="opt_snb_full_screen">
|
||||
<property name="text">
|
||||
<string>Optimize for full-sceen view </string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
|
||||
@ -587,8 +587,6 @@ class BulkSeries(BulkBase):
|
||||
else:
|
||||
s_index = self.db.get_custom_extra(book_id, num=self.col_id,
|
||||
index_is_id=True)
|
||||
if s_index is None:
|
||||
s_index = 1.0
|
||||
extras.append(s_index)
|
||||
self.db.set_custom_bulk(book_ids, val, extras=extras,
|
||||
num=self.col_id, notify=notify)
|
||||
|
||||
51
src/calibre/gui2/dialogs/confirm_delete_location.py
Normal file
51
src/calibre/gui2/dialogs/confirm_delete_location.py
Normal file
@ -0,0 +1,51 @@
|
||||
#!/usr/bin/env python
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' \
|
||||
'2010, John Schember <john@nachtimwald.com>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
from functools import partial
|
||||
|
||||
from calibre.gui2.dialogs.confirm_delete_location_ui import Ui_Dialog
|
||||
from PyQt4.Qt import QDialog, Qt, QPixmap, QIcon
|
||||
|
||||
class Dialog(QDialog, Ui_Dialog):
|
||||
|
||||
def __init__(self, msg, name, parent):
|
||||
QDialog.__init__(self, parent)
|
||||
self.setupUi(self)
|
||||
|
||||
self.loc = None
|
||||
self.msg.setText(msg)
|
||||
self.name = name
|
||||
self.buttonBox.setFocus(Qt.OtherFocusReason)
|
||||
self.button_lib.clicked.connect(partial(self.set_loc, 'lib'))
|
||||
self.button_device.clicked.connect(partial(self.set_loc, 'dev'))
|
||||
self.button_both.clicked.connect(partial(self.set_loc, 'both'))
|
||||
|
||||
def set_loc(self, loc):
|
||||
self.loc = loc
|
||||
self.accept()
|
||||
|
||||
def choice(self):
|
||||
return self.loc
|
||||
|
||||
def break_cycles(self):
|
||||
for x in ('lib', 'device', 'both'):
|
||||
b = getattr(self, 'button_'+x)
|
||||
try:
|
||||
b.clicked.disconnect()
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
def confirm_location(msg, name, parent=None, pixmap='dialog_warning.png'):
|
||||
d = Dialog(msg, name, parent)
|
||||
d.label.setPixmap(QPixmap(I(pixmap)))
|
||||
d.setWindowIcon(QIcon(I(pixmap)))
|
||||
d.resize(d.sizeHint())
|
||||
ret = d.exec_()
|
||||
d.break_cycles()
|
||||
if ret == d.Accepted:
|
||||
return d.choice()
|
||||
return None
|
||||
116
src/calibre/gui2/dialogs/confirm_delete_location.ui
Normal file
116
src/calibre/gui2/dialogs/confirm_delete_location.ui
Normal file
@ -0,0 +1,116 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Dialog</class>
|
||||
<widget class="QDialog" name="Dialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>459</width>
|
||||
<height>300</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Where do you want to delete from?</string>
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
<normaloff>:/images/dialog_warning.png</normaloff>:/images/dialog_warning.png</iconset>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="pixmap">
|
||||
<pixmap resource="../../../../resources/images.qrc">:/images/dialog_warning.png</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="msg">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QPushButton" name="button_lib">
|
||||
<property name="text">
|
||||
<string>Library</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="button_device">
|
||||
<property name="text">
|
||||
<string>Device</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="button_both">
|
||||
<property name="text">
|
||||
<string>Library and Device</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources>
|
||||
<include location="../../../../resources/images.qrc"/>
|
||||
</resources>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>Dialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
@ -16,6 +16,7 @@ from calibre.gui2 import error_dialog, NONE, info_dialog, config
|
||||
from calibre.gui2.widgets import ProgressIndicator
|
||||
from calibre import strftime, force_unicode
|
||||
from calibre.customize.ui import get_isbndb_key, set_isbndb_key
|
||||
from calibre.utils.icu import sort_key
|
||||
|
||||
_hung_fetchers = set([])
|
||||
|
||||
@ -72,27 +73,33 @@ class Matches(QAbstractTableModel):
|
||||
def summary(self, row):
|
||||
return self.matches[row].comments
|
||||
|
||||
def data_as_text(self, book, col):
|
||||
if col == 0 and book.title is not None:
|
||||
return book.title
|
||||
elif col == 1:
|
||||
return ', '.join(book.authors)
|
||||
elif col == 2 and book.author_sort is not None:
|
||||
return book.author_sort
|
||||
elif col == 3 and book.publisher is not None:
|
||||
return book.publisher
|
||||
elif col == 4 and book.isbn is not None:
|
||||
return book.isbn
|
||||
elif col == 5 and hasattr(book.pubdate, 'timetuple'):
|
||||
return strftime('%b %Y', book.pubdate.timetuple())
|
||||
elif col == 6 and book.has_cover:
|
||||
return 'y'
|
||||
elif col == 7 and book.comments:
|
||||
return 'y'
|
||||
return ''
|
||||
|
||||
def data(self, index, role):
|
||||
row, col = index.row(), index.column()
|
||||
book = self.matches[row]
|
||||
if role == Qt.DisplayRole:
|
||||
res = None
|
||||
if col == 0:
|
||||
res = book.title
|
||||
elif col == 1:
|
||||
res = ', '.join(book.authors)
|
||||
elif col == 2:
|
||||
res = book.author_sort
|
||||
elif col == 3:
|
||||
res = book.publisher
|
||||
elif col == 4:
|
||||
res = book.isbn
|
||||
elif col == 5:
|
||||
if hasattr(book.pubdate, 'timetuple'):
|
||||
res = strftime('%b %Y', book.pubdate.timetuple())
|
||||
if not res:
|
||||
return NONE
|
||||
return QVariant(res)
|
||||
res = self.data_as_text(book, col)
|
||||
if col <= 5 and res:
|
||||
return QVariant(res)
|
||||
return NONE
|
||||
elif role == Qt.DecorationRole:
|
||||
if col == 6 and book.has_cover:
|
||||
return self.yes_icon
|
||||
@ -100,6 +107,16 @@ class Matches(QAbstractTableModel):
|
||||
return self.yes_icon
|
||||
return NONE
|
||||
|
||||
def sort(self, col, order, reset=True):
|
||||
if not self.matches:
|
||||
return
|
||||
descending = order == Qt.DescendingOrder
|
||||
self.matches.sort(None,
|
||||
lambda x: sort_key(unicode(force_unicode(self.data_as_text(x, col)))),
|
||||
descending)
|
||||
if reset:
|
||||
self.reset()
|
||||
|
||||
class FetchMetadata(QDialog, Ui_FetchMetadata):
|
||||
|
||||
HANG_TIME = 75 #seconds
|
||||
@ -136,6 +153,11 @@ class FetchMetadata(QDialog, Ui_FetchMetadata):
|
||||
self.connect(self.matches, SIGNAL('entered(QModelIndex)'),
|
||||
self.show_summary)
|
||||
self.matches.setMouseTracking(True)
|
||||
# Enabling sorting and setting a sort column will not change the initial
|
||||
# order of the results, as they are filled in later
|
||||
self.matches.setSortingEnabled(True)
|
||||
self.matches.horizontalHeader().sectionClicked.connect(self.show_sort_indicator)
|
||||
self.matches.horizontalHeader().setSortIndicatorShown(False)
|
||||
self.fetch_metadata()
|
||||
self.opt_get_social_metadata.setChecked(config['get_social_metadata'])
|
||||
self.opt_overwrite_author_title_metadata.setChecked(config['overwrite_author_title_metadata'])
|
||||
@ -243,3 +265,7 @@ class FetchMetadata(QDialog, Ui_FetchMetadata):
|
||||
def chosen(self, index):
|
||||
self.matches.setCurrentIndex(index)
|
||||
self.accept()
|
||||
|
||||
def show_sort_indicator(self, *args):
|
||||
self.matches.horizontalHeader().setSortIndicatorShown(True)
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
|
||||
|
||||
'''Dialog to edit metadata in bulk'''
|
||||
|
||||
import re
|
||||
import re, os
|
||||
|
||||
from PyQt4.Qt import Qt, QDialog, QGridLayout, QVBoxLayout, QFont, QLabel, \
|
||||
pyqtSignal, QDialogButtonBox
|
||||
@ -12,12 +12,42 @@ from PyQt4 import QtGui
|
||||
from calibre.gui2.dialogs.metadata_bulk_ui import Ui_MetadataBulkDialog
|
||||
from calibre.gui2.dialogs.tag_editor import TagEditor
|
||||
from calibre.ebooks.metadata import string_to_authors, authors_to_string
|
||||
from calibre.ebooks.metadata.book.base import composite_formatter
|
||||
from calibre.ebooks.metadata.meta import get_metadata
|
||||
from calibre.gui2.custom_column_widgets import populate_metadata_page
|
||||
from calibre.gui2 import error_dialog
|
||||
from calibre.gui2.progress_indicator import ProgressIndicator
|
||||
from calibre.utils.config import dynamic
|
||||
from calibre.utils.titlecase import titlecase
|
||||
from calibre.utils.icu import sort_key, capitalize
|
||||
from calibre.utils.config import prefs
|
||||
from calibre.utils.magick.draw import identify_data
|
||||
|
||||
def get_cover_data(path):
|
||||
old = prefs['read_file_metadata']
|
||||
if not old:
|
||||
prefs['read_file_metadata'] = True
|
||||
cdata = area = None
|
||||
|
||||
try:
|
||||
mi = get_metadata(open(path, 'rb'),
|
||||
os.path.splitext(path)[1][1:].lower())
|
||||
if mi.cover and os.access(mi.cover, os.R_OK):
|
||||
cdata = open(mi.cover).read()
|
||||
elif mi.cover_data[1] is not None:
|
||||
cdata = mi.cover_data[1]
|
||||
if cdata:
|
||||
width, height, fmt = identify_data(cdata)
|
||||
area = width*height
|
||||
except:
|
||||
cdata = area = None
|
||||
|
||||
if old != prefs['read_file_metadata']:
|
||||
prefs['read_file_metadata'] = old
|
||||
|
||||
return cdata, area
|
||||
|
||||
|
||||
|
||||
class MyBlockingBusy(QDialog):
|
||||
|
||||
@ -146,6 +176,20 @@ class MyBlockingBusy(QDialog):
|
||||
cdata = calibre_cover(mi.title, mi.format_field('authors')[-1],
|
||||
series_string=series_string)
|
||||
self.db.set_cover(id, cdata)
|
||||
elif cover_action == 'fromfmt':
|
||||
fmts = self.db.formats(id, index_is_id=True, verify_formats=False)
|
||||
if fmts:
|
||||
covers = []
|
||||
for fmt in fmts.split(','):
|
||||
fmt = self.db.format_abspath(id, fmt, index_is_id=True)
|
||||
if not fmt: continue
|
||||
cdata, area = get_cover_data(fmt)
|
||||
if cdata:
|
||||
covers.append((cdata, area))
|
||||
covers.sort(key=lambda x: x[1])
|
||||
if covers:
|
||||
self.db.set_cover(id, covers[-1][0])
|
||||
covers = []
|
||||
elif self.current_phase == 2:
|
||||
# All of these just affect the DB, so we can tolerate a total rollback
|
||||
if do_auto_author:
|
||||
@ -268,6 +312,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
|
||||
def prepare_search_and_replace(self):
|
||||
self.search_for.initialize('bulk_edit_search_for')
|
||||
self.replace_with.initialize('bulk_edit_replace_with')
|
||||
self.s_r_template.initialize('bulk_edit_template')
|
||||
self.test_text.initialize('bulk_edit_test_test')
|
||||
self.all_fields = ['']
|
||||
self.writable_fields = ['']
|
||||
@ -282,9 +327,10 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
|
||||
if f in ['sort'] or fm[f]['datatype'] == 'composite':
|
||||
self.all_fields.append(f)
|
||||
self.all_fields.sort()
|
||||
self.all_fields.insert(1, '{template}')
|
||||
self.writable_fields.sort()
|
||||
self.search_field.setMaxVisibleItems(20)
|
||||
self.destination_field.setMaxVisibleItems(20)
|
||||
self.search_field.setMaxVisibleItems(25)
|
||||
self.destination_field.setMaxVisibleItems(25)
|
||||
offset = 10
|
||||
self.s_r_number_of_books = min(10, len(self.ids))
|
||||
for i in range(1,self.s_r_number_of_books+1):
|
||||
@ -360,22 +406,28 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
|
||||
self.test_text.editTextChanged[str].connect(self.s_r_paint_results)
|
||||
self.comma_separated.stateChanged.connect(self.s_r_paint_results)
|
||||
self.case_sensitive.stateChanged.connect(self.s_r_paint_results)
|
||||
self.s_r_template.lost_focus.connect(self.s_r_template_changed)
|
||||
self.central_widget.setCurrentIndex(0)
|
||||
|
||||
self.search_for.completer().setCaseSensitivity(Qt.CaseSensitive)
|
||||
self.replace_with.completer().setCaseSensitivity(Qt.CaseSensitive)
|
||||
self.s_r_template.completer().setCaseSensitivity(Qt.CaseSensitive)
|
||||
|
||||
self.s_r_search_mode_changed(self.search_mode.currentIndex())
|
||||
|
||||
def s_r_get_field(self, mi, field):
|
||||
if field:
|
||||
if field == '{template}':
|
||||
v = composite_formatter.safe_format\
|
||||
(unicode(self.s_r_template.text()), mi, _('S/R TEMPLATE ERROR'), mi)
|
||||
return [v]
|
||||
fm = self.db.metadata_for_field(field)
|
||||
if field == 'sort':
|
||||
val = mi.get('title_sort', None)
|
||||
else:
|
||||
val = mi.get(field, None)
|
||||
if val is None:
|
||||
val = []
|
||||
val = [] if fm['is_multiple'] else ['']
|
||||
elif not fm['is_multiple']:
|
||||
val = [val]
|
||||
elif field == 'authors':
|
||||
@ -384,7 +436,16 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
|
||||
val = []
|
||||
return val
|
||||
|
||||
def s_r_template_changed(self):
|
||||
self.s_r_search_field_changed(self.search_field.currentIndex())
|
||||
|
||||
def s_r_search_field_changed(self, idx):
|
||||
if self.search_mode.currentIndex() != 0 and idx == 1: # Template
|
||||
self.s_r_template.setVisible(True)
|
||||
self.template_label.setVisible(True)
|
||||
else:
|
||||
self.s_r_template.setVisible(False)
|
||||
self.template_label.setVisible(False)
|
||||
for i in range(0, self.s_r_number_of_books):
|
||||
w = getattr(self, 'book_%d_text'%(i+1))
|
||||
mi = self.db.get_metadata(self.ids[i], index_is_id=True)
|
||||
@ -547,11 +608,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
|
||||
if not dest:
|
||||
dest = source
|
||||
dfm = self.db.field_metadata[dest]
|
||||
|
||||
mi = self.db.get_metadata(id, index_is_id=True,)
|
||||
val = mi.get(source)
|
||||
if val is None:
|
||||
return
|
||||
val = self.s_r_do_regexp(mi)
|
||||
val = self.s_r_do_destination(mi, val)
|
||||
if dfm['is_multiple']:
|
||||
@ -700,6 +757,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
|
||||
cover_action = 'remove'
|
||||
elif self.cover_generate.isChecked():
|
||||
cover_action = 'generate'
|
||||
elif self.cover_from_fmt.isChecked():
|
||||
cover_action = 'fromfmt'
|
||||
|
||||
args = (remove_all, remove, add, au, aus, do_aus, rating, pub, do_series,
|
||||
do_autonumber, do_remove_format, remove_format, do_swap_ta,
|
||||
|
||||
@ -414,6 +414,13 @@ Future conversion of these books will use the default settings.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="cover_from_fmt">
|
||||
<property name="text">
|
||||
<string>Set from &ebook file(s)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
@ -501,6 +508,29 @@ Future conversion of these books will use the default settings.</string>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="template_label">
|
||||
<property name="text">
|
||||
<string>Te&mplate:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>s_r_template</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="HistoryLineEdit" name="s_r_template">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||
<horstretch>100</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Enter a template to be used as the source for the search/replace</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="xlabel_2">
|
||||
<property name="text">
|
||||
<string>&Search for:</string>
|
||||
@ -510,7 +540,7 @@ Future conversion of these books will use the default settings.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<item row="5" column="1">
|
||||
<widget class="HistoryLineEdit" name="search_for">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||
@ -523,7 +553,7 @@ Future conversion of these books will use the default settings.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="2">
|
||||
<item row="5" column="2">
|
||||
<widget class="QCheckBox" name="case_sensitive">
|
||||
<property name="toolTip">
|
||||
<string>Check this box if the search string must match exactly upper and lower case. Uncheck it if case is to be ignored</string>
|
||||
@ -536,7 +566,7 @@ Future conversion of these books will use the default settings.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="xlabel_4">
|
||||
<property name="text">
|
||||
<string>&Replace with:</string>
|
||||
@ -546,14 +576,14 @@ Future conversion of these books will use the default settings.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<item row="6" column="1">
|
||||
<widget class="HistoryLineEdit" name="replace_with">
|
||||
<property name="toolTip">
|
||||
<string>The replacement text. The matched search text will be replaced with this string</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="2">
|
||||
<item row="6" column="2">
|
||||
<layout class="QHBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_41">
|
||||
@ -588,7 +618,7 @@ field is processed. In regular expression mode, only the matched text is process
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<item row="7" column="0">
|
||||
<widget class="QLabel" name="destination_field_label">
|
||||
<property name="text">
|
||||
<string>&Destination field:</string>
|
||||
@ -598,14 +628,15 @@ field is processed. In regular expression mode, only the matched text is process
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1">
|
||||
<item row="7" column="1">
|
||||
<widget class="QComboBox" name="destination_field">
|
||||
<property name="toolTip">
|
||||
<string>The field that the text will be put into after all replacements. If blank, the source field is used.</string>
|
||||
<string>The field that the text will be put into after all replacements.
|
||||
If blank, the source field is used if the field is modifiable</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="2">
|
||||
<item row="7" column="2">
|
||||
<layout class="QHBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="replace_mode_label">
|
||||
@ -653,7 +684,7 @@ nothing should be put between the original text and the inserted text</string>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<item row="8" column="1">
|
||||
<widget class="QLabel" name="xlabel_3">
|
||||
<property name="text">
|
||||
<string>Test &text</string>
|
||||
@ -663,7 +694,7 @@ nothing should be put between the original text and the inserted text</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="2">
|
||||
<item row="8" column="2">
|
||||
<widget class="QLabel" name="label_51">
|
||||
<property name="text">
|
||||
<string>Test re&sult</string>
|
||||
@ -686,8 +717,8 @@ nothing should be put between the original text and the inserted text</string>
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>122</width>
|
||||
<height>38</height>
|
||||
<width>726</width>
|
||||
<height>334</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="testgrid">
|
||||
@ -784,6 +815,7 @@ nothing should be put between the original text and the inserted text</string>
|
||||
<tabstop>central_widget</tabstop>
|
||||
<tabstop>search_field</tabstop>
|
||||
<tabstop>search_mode</tabstop>
|
||||
<tabstop>s_r_template</tabstop>
|
||||
<tabstop>search_for</tabstop>
|
||||
<tabstop>case_sensitive</tabstop>
|
||||
<tabstop>replace_with</tabstop>
|
||||
|
||||
@ -34,6 +34,7 @@ from calibre.customize.ui import run_plugins_on_import, get_isbndb_key
|
||||
from calibre.gui2.preferences.social import SocialMetadata
|
||||
from calibre.gui2.custom_column_widgets import populate_metadata_page
|
||||
from calibre import strftime
|
||||
from calibre.library.comments import comments_to_html
|
||||
|
||||
class CoverFetcher(Thread): # {{{
|
||||
|
||||
@ -195,7 +196,6 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
|
||||
_file + _(" is not a valid picture"))
|
||||
d.exec_()
|
||||
else:
|
||||
self.cover_path.setText(_file)
|
||||
self.cover.setPixmap(pix)
|
||||
self.update_cover_tooltip()
|
||||
self.cover_changed = True
|
||||
@ -409,7 +409,8 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
|
||||
if mi.series_index is not None:
|
||||
self.series_index.setValue(float(mi.series_index))
|
||||
if mi.comments and mi.comments.strip():
|
||||
self.comments.setPlainText(mi.comments)
|
||||
comments = comments_to_html(mi.comments)
|
||||
self.comments.html = comments
|
||||
|
||||
|
||||
def sync_formats(self):
|
||||
@ -556,7 +557,9 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
|
||||
if rating > 0:
|
||||
self.rating.setValue(int(rating/2.))
|
||||
comments = self.db.comments(row)
|
||||
self.comments.setPlainText(comments if comments else '')
|
||||
if comments and comments.strip():
|
||||
comments = comments_to_html(comments)
|
||||
self.comments.html = comments
|
||||
cover = self.db.cover(row)
|
||||
pubdate = db.pubdate(self.id, index_is_id=True)
|
||||
self.pubdate.setDate(QDate(pubdate.year, pubdate.month,
|
||||
@ -806,10 +809,10 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
|
||||
self.pubdate.setDate(QDate(dt.year, dt.month, dt.day))
|
||||
summ = book.comments
|
||||
if summ:
|
||||
prefix = unicode(self.comments.toPlainText())
|
||||
prefix = self.comments.html
|
||||
if prefix:
|
||||
prefix += '\n'
|
||||
self.comments.setPlainText(prefix + summ)
|
||||
self.comments.html = prefix + comments_to_html(summ)
|
||||
if book.rating is not None:
|
||||
self.rating.setValue(int(book.rating))
|
||||
if book.tags:
|
||||
@ -899,7 +902,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
|
||||
self.db.set_series_index(self.id, self.series_index.value(),
|
||||
notify=False, commit=False)
|
||||
self.db.set_comment(self.id,
|
||||
unicode(self.comments.toPlainText()).strip(),
|
||||
self.comments.html,
|
||||
notify=False, commit=False)
|
||||
d = self.pubdate.date()
|
||||
d = qt_to_dt(d)
|
||||
@ -936,16 +939,16 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
|
||||
QDialog.reject(self, *args)
|
||||
|
||||
def read_state(self):
|
||||
wg = dynamic.get('metasingle_window_geometry', None)
|
||||
ss = dynamic.get('metasingle_splitter_state', None)
|
||||
wg = dynamic.get('metasingle_window_geometry2', None)
|
||||
ss = dynamic.get('metasingle_splitter_state2', None)
|
||||
if wg is not None:
|
||||
self.restoreGeometry(wg)
|
||||
if ss is not None:
|
||||
self.splitter.restoreState(ss)
|
||||
|
||||
def save_state(self):
|
||||
dynamic.set('metasingle_window_geometry', bytes(self.saveGeometry()))
|
||||
dynamic.set('metasingle_splitter_state',
|
||||
dynamic.set('metasingle_window_geometry2', bytes(self.saveGeometry()))
|
||||
dynamic.set('metasingle_splitter_state2',
|
||||
bytes(self.splitter.saveState()))
|
||||
|
||||
def break_cycles(self):
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>887</width>
|
||||
<height>750</height>
|
||||
<width>994</width>
|
||||
<height>716</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
@ -43,8 +43,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>879</width>
|
||||
<height>711</height>
|
||||
<width>986</width>
|
||||
<height>677</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_5">
|
||||
@ -66,8 +66,8 @@
|
||||
<attribute name="title">
|
||||
<string>&Basic metadata</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout_5">
|
||||
<item row="0" column="0">
|
||||
<widget class="QSplitter" name="splitter">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
@ -496,28 +496,147 @@ Using this button to create author sort will change author sort from red to gree
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_2">
|
||||
<property name="title">
|
||||
<string>&Comments</string>
|
||||
<spacer name="verticalSpacer_5">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<item row="0" column="0">
|
||||
<widget class="QTextEdit" name="comments">
|
||||
<property name="tabChangesFocus">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="acceptRichText">
|
||||
<bool>false</bool>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Fixed</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="layoutWidget_2">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="bc_box">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>10</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Book Cover</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<item>
|
||||
<widget class="ImageView" name="cover" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>100</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="_4">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="sizeConstraint">
|
||||
<enum>QLayout::SetMaximumSize</enum>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>Change &cover image:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>cover_button</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="_5">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QPushButton" name="cover_button">
|
||||
<property name="text">
|
||||
<string>&Browse</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
<normaloff>:/images/document_open.png</normaloff>:/images/document_open.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="trim_cover_button">
|
||||
<property name="toolTip">
|
||||
<string>Remove border (if any) from cover</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>T&rim</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
<normaloff>:/images/trim.png</normaloff>:/images/trim.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="reset_cover">
|
||||
<property name="toolTip">
|
||||
<string>Reset cover to default</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Remove</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
<normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="_6">
|
||||
<item>
|
||||
<widget class="QPushButton" name="fetch_cover_button">
|
||||
<property name="text">
|
||||
<string>Download co&ver</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="generate_cover_button">
|
||||
<property name="toolTip">
|
||||
<string>Generate a default cover based on the title and author</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Generate cover</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="layoutWidget_2">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="af_group_box">
|
||||
<property name="sizePolicy">
|
||||
@ -546,6 +665,12 @@ Using this button to create author sort will change author sort from red to gree
|
||||
<height>140</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="baseSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="dragDropMode">
|
||||
<enum>QAbstractItemView::DropOnly</enum>
|
||||
</property>
|
||||
@ -644,129 +769,22 @@ Using this button to create author sort will change author sort from red to gree
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="bc_box">
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>10</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Book Cover</string>
|
||||
<string>&Comments</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_8">
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="ImageView" name="cover" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>100</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="_4">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="sizeConstraint">
|
||||
<enum>QLayout::SetMaximumSize</enum>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>Change &cover image:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>cover_path</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="_5">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="cover_path">
|
||||
<property name="readOnly">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="cover_button">
|
||||
<property name="text">
|
||||
<string>&Browse</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
<normaloff>:/images/document_open.png</normaloff>:/images/document_open.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="trim_cover_button">
|
||||
<property name="toolTip">
|
||||
<string>Remove border (if any) from cover</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>T&rim</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
<normaloff>:/images/trim.png</normaloff>:/images/trim.png</iconset>
|
||||
</property>
|
||||
<property name="toolButtonStyle">
|
||||
<enum>Qt::ToolButtonTextBesideIcon</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="reset_cover">
|
||||
<property name="toolTip">
|
||||
<string>Reset cover to default</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
<normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="_6">
|
||||
<item>
|
||||
<widget class="QPushButton" name="fetch_cover_button">
|
||||
<property name="text">
|
||||
<string>Download co&ver</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="generate_cover_button">
|
||||
<property name="toolTip">
|
||||
<string>Generate a default cover based on the title and author</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Generate cover</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
<widget class="Editor" name="comments" native="true"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
@ -828,6 +846,12 @@ Using this button to create author sort will change author sort from red to gree
|
||||
<header>calibre/gui2/widgets.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>Editor</class>
|
||||
<extends>QWidget</extends>
|
||||
<header location="global">calibre/gui2/comments_editor.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
<tabstop>title</tabstop>
|
||||
@ -848,13 +872,11 @@ Using this button to create author sort will change author sort from red to gree
|
||||
<tabstop>date</tabstop>
|
||||
<tabstop>pubdate</tabstop>
|
||||
<tabstop>fetch_metadata_button</tabstop>
|
||||
<tabstop>comments</tabstop>
|
||||
<tabstop>button_set_cover</tabstop>
|
||||
<tabstop>button_set_metadata</tabstop>
|
||||
<tabstop>formats</tabstop>
|
||||
<tabstop>add_format_button</tabstop>
|
||||
<tabstop>remove_format_button</tabstop>
|
||||
<tabstop>cover_path</tabstop>
|
||||
<tabstop>cover_button</tabstop>
|
||||
<tabstop>trim_cover_button</tabstop>
|
||||
<tabstop>reset_cover</tabstop>
|
||||
|
||||
@ -23,7 +23,6 @@ from calibre.ebooks.metadata.meta import set_metadata as _set_metadata
|
||||
from calibre.utils.search_query_parser import SearchQueryParser
|
||||
from calibre.library.caches import _match, CONTAINS_MATCH, EQUALS_MATCH, \
|
||||
REGEXP_MATCH, MetadataBackup
|
||||
from calibre.library.cli import parse_series_string
|
||||
from calibre import strftime, isbytestring, prepare_string_for_xml
|
||||
from calibre.constants import filesystem_encoding, DEBUG
|
||||
from calibre.gui2.library import DEFAULT_SORT
|
||||
@ -725,9 +724,7 @@ class BooksModel(QAbstractTableModel): # {{{
|
||||
return False
|
||||
val = qt_to_dt(val, as_utc=False)
|
||||
elif typ == 'series':
|
||||
val, s_index = parse_series_string(self.db, label, value.toString())
|
||||
if not val:
|
||||
val = s_index = None
|
||||
val = unicode(value.toString()).strip()
|
||||
elif typ == 'composite':
|
||||
tmpl = unicode(value.toString()).strip()
|
||||
disp = cc['display']
|
||||
|
||||
@ -123,8 +123,8 @@ class BooksView(QTableView): # {{{
|
||||
elif action == 'show':
|
||||
h.setSectionHidden(idx, False)
|
||||
if h.sectionSize(idx) < 3:
|
||||
sz = h.sectionSizeHint(idx)
|
||||
h.resizeSection(idx, sz)
|
||||
sz = h.sectionSizeHint(idx)
|
||||
h.resizeSection(idx, sz)
|
||||
elif action == 'ascending':
|
||||
self.sortByColumn(idx, Qt.AscendingOrder)
|
||||
elif action == 'descending':
|
||||
|
||||
@ -103,7 +103,7 @@ class PluginModel(QAbstractItemModel): # {{{
|
||||
plugin = self.index_to_plugin(index)
|
||||
if role == Qt.DisplayRole:
|
||||
ver = '.'.join(map(str, plugin.version))
|
||||
desc = '\n'.join(textwrap.wrap(plugin.description, 50))
|
||||
desc = '\n'.join(textwrap.wrap(plugin.description, 100))
|
||||
ans='%s (%s) %s %s\n%s'%(plugin.name, ver, _('by'), plugin.author, desc)
|
||||
c = plugin_customization(plugin)
|
||||
if c:
|
||||
|
||||
@ -206,17 +206,23 @@ class SearchBox2(QComboBox): # {{{
|
||||
self.line_edit.blockSignals(yes)
|
||||
|
||||
def set_search_string(self, txt, store_in_history=False, emit_changed=True):
|
||||
self.setFocus(Qt.OtherFocusReason)
|
||||
if not txt:
|
||||
self.clear()
|
||||
else:
|
||||
self.normalize_state()
|
||||
self.setEditText(txt)
|
||||
self.line_edit.end(False)
|
||||
if emit_changed:
|
||||
self.changed.emit()
|
||||
self._do_search(store_in_history=store_in_history)
|
||||
self.focus_to_library.emit()
|
||||
if not store_in_history:
|
||||
self.activated.disconnect()
|
||||
try:
|
||||
self.setFocus(Qt.OtherFocusReason)
|
||||
if not txt:
|
||||
self.clear()
|
||||
else:
|
||||
self.normalize_state()
|
||||
self.setEditText(txt)
|
||||
self.line_edit.end(False)
|
||||
if emit_changed:
|
||||
self.changed.emit()
|
||||
self._do_search(store_in_history=store_in_history)
|
||||
self.focus_to_library.emit()
|
||||
finally:
|
||||
if not store_in_history:
|
||||
self.activated.connect(self.history_selected)
|
||||
|
||||
def search_as_you_type(self, enabled):
|
||||
self.as_you_type = enabled
|
||||
|
||||
@ -18,6 +18,7 @@ from PyQt4.Qt import Qt, QTreeView, QApplication, pyqtSignal, \
|
||||
from calibre.ebooks.metadata import title_sort
|
||||
from calibre.gui2 import config, NONE
|
||||
from calibre.library.field_metadata import TagsIcons, category_icon_map
|
||||
from calibre.utils.config import tweaks
|
||||
from calibre.utils.icu import sort_key
|
||||
from calibre.utils.search_query_parser import saved_searches
|
||||
from calibre.gui2 import error_dialog
|
||||
@ -409,17 +410,31 @@ class TagTreeItem(object): # {{{
|
||||
return NONE
|
||||
|
||||
def tag_data(self, role):
|
||||
tag = self.tag
|
||||
if tag.category == 'authors' and \
|
||||
tweaks['categories_use_field_for_author_name'] == 'author_sort':
|
||||
name = tag.sort
|
||||
tt_author = True
|
||||
else:
|
||||
name = tag.name
|
||||
tt_author = False
|
||||
if role == Qt.DisplayRole:
|
||||
if self.tag.count == 0:
|
||||
return QVariant('%s'%(self.tag.name))
|
||||
if tag.count == 0:
|
||||
return QVariant('%s'%(name))
|
||||
else:
|
||||
return QVariant('[%d] %s'%(self.tag.count, self.tag.name))
|
||||
return QVariant('[%d] %s'%(tag.count, name))
|
||||
if role == Qt.EditRole:
|
||||
return QVariant(self.tag.name)
|
||||
return QVariant(tag.name)
|
||||
if role == Qt.DecorationRole:
|
||||
return self.icon_state_map[self.tag.state]
|
||||
if role == Qt.ToolTipRole and self.tag.tooltip is not None:
|
||||
return QVariant(self.tag.tooltip)
|
||||
return self.icon_state_map[tag.state]
|
||||
if role == Qt.ToolTipRole:
|
||||
if tt_author:
|
||||
if tag.tooltip is not None:
|
||||
return QVariant('(%s) %s'%(tag.name, tag.tooltip))
|
||||
else:
|
||||
return QVariant(tag.name)
|
||||
if tag.tooltip is not None:
|
||||
return QVariant(tag.tooltip)
|
||||
return NONE
|
||||
|
||||
def toggle(self):
|
||||
@ -680,8 +695,10 @@ class TagsModel(QAbstractItemModel): # {{{
|
||||
def setData(self, index, value, role=Qt.EditRole):
|
||||
if not index.isValid():
|
||||
return NONE
|
||||
# set up to position at the category label
|
||||
path = self.path_for_index(self.parent(index))
|
||||
# set up to reposition at the same item. We can do this except if
|
||||
# working with the last item and that item is deleted, in which case
|
||||
# we position at the parent label
|
||||
path = index.model().path_for_index(index)
|
||||
val = unicode(value.toString())
|
||||
if not val:
|
||||
error_dialog(self.tags_view, _('Item is blank'),
|
||||
@ -932,18 +949,22 @@ class TagBrowserMixin(object): # {{{
|
||||
for old_id in to_rename[text]:
|
||||
rename_func(old_id, new_name=unicode(text))
|
||||
|
||||
# Clean up everything, as information could have changed for many books.
|
||||
self.library_view.model().refresh()
|
||||
self.tags_view.set_new_model()
|
||||
self.tags_view.recount()
|
||||
self.saved_search.clear()
|
||||
self.search.clear()
|
||||
# Clean up the library view
|
||||
self.do_tag_item_renamed()
|
||||
self.tags_view.set_new_model() # does a refresh for free
|
||||
|
||||
def do_tag_item_renamed(self):
|
||||
# Clean up library view and search
|
||||
self.library_view.model().refresh()
|
||||
self.saved_search.clear()
|
||||
self.search.clear()
|
||||
# get information to redo the selection
|
||||
rows = [r.row() for r in \
|
||||
self.library_view.selectionModel().selectedRows()]
|
||||
m = self.library_view.model()
|
||||
ids = [m.id(r) for r in rows]
|
||||
|
||||
m.refresh(reset=False)
|
||||
m.research()
|
||||
self.library_view.select_rows(ids)
|
||||
# refreshing the tags view happens at the emit()/call() site
|
||||
|
||||
def do_author_sort_edit(self, parent, id):
|
||||
db = self.library_view.model().db
|
||||
|
||||
@ -3,8 +3,7 @@ __license__ = 'GPL v3'
|
||||
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
'''
|
||||
'''
|
||||
# Imports {{{
|
||||
import os, math, re, glob, sys
|
||||
from base64 import b64encode
|
||||
from functools import partial
|
||||
@ -19,11 +18,14 @@ from calibre.utils.config import Config, StringConfig
|
||||
from calibre.utils.localization import get_language
|
||||
from calibre.gui2.viewer.config_ui import Ui_Dialog
|
||||
from calibre.gui2.viewer.flip import SlideFlip
|
||||
from calibre.gui2.viewer.gestures import Gestures
|
||||
from calibre.gui2.shortcuts import Shortcuts, ShortcutConfig
|
||||
from calibre.constants import iswindows
|
||||
from calibre import prints, guess_type
|
||||
from calibre.gui2.viewer.keys import SHORTCUTS
|
||||
|
||||
# }}}
|
||||
|
||||
bookmarks = referencing = hyphenation = jquery = jquery_scrollTo = \
|
||||
hyphenator = images = hyphen_pats = None
|
||||
|
||||
@ -33,6 +35,7 @@ def load_builtin_fonts():
|
||||
QFontDatabase.addApplicationFont(f)
|
||||
return 'Liberation Serif', 'Liberation Sans', 'Liberation Mono'
|
||||
|
||||
# Config {{{
|
||||
def config(defaults=None):
|
||||
desc = _('Options to customize the ebook viewer')
|
||||
if defaults is None:
|
||||
@ -137,8 +140,9 @@ class ConfigDialog(QDialog, Ui_Dialog):
|
||||
str(self.hyphenate_default_lang.itemData(idx).toString()))
|
||||
return QDialog.accept(self, *args)
|
||||
|
||||
# }}}
|
||||
|
||||
class Document(QWebPage):
|
||||
class Document(QWebPage): # {{{
|
||||
|
||||
def set_font_settings(self):
|
||||
opts = config().parse()
|
||||
@ -188,6 +192,7 @@ class Document(QWebPage):
|
||||
|
||||
# Miscellaneous
|
||||
settings.setAttribute(QWebSettings.LinksIncludedInFocusChain, True)
|
||||
settings.setAttribute(QWebSettings.DeveloperExtrasEnabled, True)
|
||||
self.set_user_stylesheet()
|
||||
self.misc_config()
|
||||
|
||||
@ -448,7 +453,9 @@ class Document(QWebPage):
|
||||
self.height+amount)
|
||||
self.setPreferredContentsSize(s)
|
||||
|
||||
class EntityDeclarationProcessor(object):
|
||||
# }}}
|
||||
|
||||
class EntityDeclarationProcessor(object): # {{{
|
||||
|
||||
def __init__(self, html):
|
||||
self.declared_entities = {}
|
||||
@ -459,14 +466,16 @@ class EntityDeclarationProcessor(object):
|
||||
self.processed_html = html
|
||||
for key, val in self.declared_entities.iteritems():
|
||||
self.processed_html = self.processed_html.replace('&%s;'%key, val)
|
||||
# }}}
|
||||
|
||||
class DocumentView(QWebView):
|
||||
class DocumentView(QWebView): # {{{
|
||||
|
||||
DISABLED_BRUSH = QBrush(Qt.lightGray, Qt.Dense5Pattern)
|
||||
|
||||
def __init__(self, *args):
|
||||
QWebView.__init__(self, *args)
|
||||
self.flipper = SlideFlip(self)
|
||||
self.gestures = Gestures()
|
||||
self.is_auto_repeat_event = False
|
||||
self.debug_javascript = False
|
||||
self.shortcuts = Shortcuts(SHORTCUTS, 'shortcuts/viewer')
|
||||
@ -952,6 +961,29 @@ class DocumentView(QWebView):
|
||||
self.manager.viewport_resized(self.scroll_fraction)
|
||||
return ret
|
||||
|
||||
def event(self, ev):
|
||||
typ = ev.type()
|
||||
if typ == ev.TouchBegin:
|
||||
try:
|
||||
self.gestures.start_gesture('touch', ev)
|
||||
except:
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
elif typ == ev.TouchEnd:
|
||||
try:
|
||||
gesture = self.gestures.end_gesture('touch', ev, self.rect())
|
||||
except:
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
if gesture is not None:
|
||||
ev.accept()
|
||||
if gesture == 'lineleft':
|
||||
self.next_page()
|
||||
elif gesture == 'lineright':
|
||||
self.previous_page()
|
||||
return True
|
||||
return QWebView.event(self, ev)
|
||||
|
||||
def mouseReleaseEvent(self, ev):
|
||||
opos = self.document.ypos
|
||||
ret = QWebView.mouseReleaseEvent(self, ev)
|
||||
@ -960,4 +992,5 @@ class DocumentView(QWebView):
|
||||
self.manager.scrolled(self.scroll_fraction)
|
||||
return ret
|
||||
|
||||
# }}}
|
||||
|
||||
|
||||
61
src/calibre/gui2/viewer/gestures.py
Normal file
61
src/calibre/gui2/viewer/gestures.py
Normal file
@ -0,0 +1,61 @@
|
||||
#!/usr/bin/env python
|
||||
# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
import time
|
||||
|
||||
class Gestures(object):
|
||||
|
||||
def __init__(self):
|
||||
self.in_progress = {}
|
||||
|
||||
def get_boundary_point(self, event):
|
||||
t = time.time()
|
||||
id_ = None
|
||||
if hasattr(event, 'touchPoints'):
|
||||
tps = list(event.touchPoints())
|
||||
tp = None
|
||||
for t in tps:
|
||||
if t.isPrimary():
|
||||
tp = t
|
||||
break
|
||||
if tp is None:
|
||||
tp = tps[0]
|
||||
gp, p = tp.screenPos(), tp.pos()
|
||||
id_ = tp.id()
|
||||
else:
|
||||
gp, p = event.globalPos(), event.pos()
|
||||
return (t, gp, p, id_)
|
||||
|
||||
def start_gesture(self, typ, event):
|
||||
self.in_progress[typ] = self.get_boundary_point(event)
|
||||
|
||||
def is_in_progress(self, typ):
|
||||
return typ in self.in_progress
|
||||
|
||||
def end_gesture(self, typ, event, widget_rect):
|
||||
if not self.is_in_progress(typ):
|
||||
return
|
||||
start = self.in_progress[typ]
|
||||
end = self.get_boundary_point(event)
|
||||
if start[3] != end[3]:
|
||||
return
|
||||
timespan = end[0] - start[0]
|
||||
start_pos, end_pos = start[1], end[1]
|
||||
xspan = end_pos.x() - start_pos.x()
|
||||
yspan = end_pos.y() - start_pos.y()
|
||||
|
||||
width = widget_rect.width()
|
||||
|
||||
if timespan < 1.1 and abs(xspan) >= width/5. and \
|
||||
abs(yspan) < abs(xspan)/5.:
|
||||
# Quick horizontal gesture
|
||||
return 'line'+('left' if xspan < 0 else 'right')
|
||||
|
||||
return None
|
||||
|
||||
|
||||
|
||||
@ -650,7 +650,8 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
|
||||
self.action_table_of_contents.setDisabled(not self.iterator.toc)
|
||||
self.current_book_has_toc = bool(self.iterator.toc)
|
||||
self.current_title = title
|
||||
self.setWindowTitle(self.base_window_title+' - '+title)
|
||||
self.setWindowTitle(self.base_window_title+' - '+title +
|
||||
' [%s]'%os.path.splitext(pathtoebook)[1][1:].upper())
|
||||
self.pos.setMaximum(sum(self.iterator.pages))
|
||||
self.pos.setSuffix(' / %d'%sum(self.iterator.pages))
|
||||
self.vertical_scrollbar.setMinimum(100)
|
||||
|
||||
@ -243,7 +243,7 @@
|
||||
<action name="action_copy">
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../resources/images.qrc">
|
||||
<normaloff>:/images/edit_copy.png</normaloff>:/images/edit_copy.png</iconset>
|
||||
<normaloff>:/images/edit-copy.png</normaloff>:/images/edit-copy.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Copy to clipboard</string>
|
||||
|
||||
@ -19,7 +19,6 @@ from calibre.gui2 import NONE, error_dialog, pixmap_to_data, gprefs
|
||||
from calibre.constants import isosx
|
||||
from calibre.gui2.filename_pattern_ui import Ui_Form
|
||||
from calibre import fit_image
|
||||
from calibre.utils.fonts import fontconfig
|
||||
from calibre.ebooks import BOOK_EXTENSIONS
|
||||
from calibre.ebooks.metadata.meta import metadata_from_filename
|
||||
from calibre.utils.config import prefs, XMLConfig
|
||||
@ -283,6 +282,7 @@ class FontFamilyModel(QAbstractListModel):
|
||||
|
||||
def __init__(self, *args):
|
||||
QAbstractListModel.__init__(self, *args)
|
||||
from calibre.utils.fonts import fontconfig
|
||||
try:
|
||||
self.families = fontconfig.find_font_families()
|
||||
except:
|
||||
@ -524,6 +524,8 @@ class EnComboBox(QComboBox):
|
||||
|
||||
class HistoryLineEdit(QComboBox):
|
||||
|
||||
lost_focus = pyqtSignal()
|
||||
|
||||
def __init__(self, *args):
|
||||
QComboBox.__init__(self, *args)
|
||||
self.setEditable(True)
|
||||
@ -559,6 +561,10 @@ class HistoryLineEdit(QComboBox):
|
||||
def text(self):
|
||||
return self.currentText()
|
||||
|
||||
def focusOutEvent(self, e):
|
||||
QComboBox.focusOutEvent(self, e)
|
||||
self.lost_focus.emit()
|
||||
|
||||
class ComboBoxWithHelp(QComboBox):
|
||||
'''
|
||||
A combobox where item 0 is help text. CurrentText will return '' for item 0.
|
||||
|
||||
@ -51,6 +51,10 @@ def comments_to_html(comments):
|
||||
if not isinstance(comments, unicode):
|
||||
comments = comments.decode(preferred_encoding, 'replace')
|
||||
|
||||
if comments.lstrip().startswith('<'):
|
||||
# Comment is already HTML do not mess with it
|
||||
return comments
|
||||
|
||||
if '<' not in comments:
|
||||
comments = prepare_string_for_xml(comments)
|
||||
parts = [u'<p class="description">%s</p>'%x.replace(u'\n', u'<br />')
|
||||
|
||||
@ -445,6 +445,9 @@ class CustomColumns(object):
|
||||
index_is_id=True)
|
||||
val = self.custom_data_adapters[data['datatype']](val, data)
|
||||
|
||||
if data['datatype'] == 'series' and extra is None:
|
||||
(val, extra) = self._get_series_values(val)
|
||||
|
||||
if data['normalized']:
|
||||
if data['datatype'] == 'enumeration' and (
|
||||
val and val not in data['display']['enum_values']):
|
||||
|
||||
@ -1128,6 +1128,14 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
||||
for l in list:
|
||||
(id, val, sort_val) = (l[0], l[1], l[2])
|
||||
tids[category][val] = (id, sort_val)
|
||||
elif cat['datatype'] == 'series':
|
||||
for l in list:
|
||||
(id, val) = (l[0], l[1])
|
||||
tids[category][val] = (id, title_sort(val))
|
||||
elif cat['datatype'] == 'rating':
|
||||
for l in list:
|
||||
(id, val) = (l[0], l[1])
|
||||
tids[category][val] = (id, '{0:05.2f}'.format(val))
|
||||
else:
|
||||
for l in list:
|
||||
(id, val) = (l[0], l[1])
|
||||
@ -1256,12 +1264,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
||||
|
||||
# sort the list
|
||||
if sort == 'name':
|
||||
def get_sort_key(x):
|
||||
sk = x.s
|
||||
if isinstance(sk, unicode):
|
||||
sk = sort_key(sk)
|
||||
return sk
|
||||
kf = get_sort_key
|
||||
kf = lambda x :sort_key(x.s)
|
||||
reverse=False
|
||||
elif sort == 'popularity':
|
||||
kf = lambda x: x.c
|
||||
@ -1967,7 +1970,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
||||
|
||||
@classmethod
|
||||
def cleanup_tags(cls, tags):
|
||||
tags = [x.strip() for x in tags if x.strip()]
|
||||
tags = [x.strip().replace(',', ';') for x in tags if x.strip()]
|
||||
tags = [x.decode(preferred_encoding, 'replace') \
|
||||
if isbytestring(x) else x for x in tags]
|
||||
tags = [u' '.join(x.split()) for x in tags]
|
||||
@ -2130,9 +2133,27 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
||||
self.conn.execute('DELETE FROM tags WHERE id=?', (id,))
|
||||
self.conn.commit()
|
||||
|
||||
series_index_pat = re.compile(r'(.*)\s+\[([.0-9]+)\]$')
|
||||
|
||||
def _get_series_values(self, val):
|
||||
if not val:
|
||||
return (val, None)
|
||||
match = self.series_index_pat.match(val.strip())
|
||||
if match is not None:
|
||||
idx = match.group(2)
|
||||
try:
|
||||
idx = float(idx)
|
||||
return (match.group(1).strip(), idx)
|
||||
except:
|
||||
pass
|
||||
return (val, None)
|
||||
|
||||
def set_series(self, id, series, notify=True, commit=True):
|
||||
self.conn.execute('DELETE FROM books_series_link WHERE book=?',(id,))
|
||||
self.conn.execute('DELETE FROM series WHERE (SELECT COUNT(id) FROM books_series_link WHERE series=series.id) < 1')
|
||||
self.conn.execute('''DELETE FROM series
|
||||
WHERE (SELECT COUNT(id) FROM books_series_link
|
||||
WHERE series=series.id) < 1''')
|
||||
(series, idx) = self._get_series_values(series)
|
||||
if series:
|
||||
if not isinstance(series, unicode):
|
||||
series = series.decode(preferred_encoding, 'replace')
|
||||
@ -2144,6 +2165,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
||||
else:
|
||||
aid = self.conn.execute('INSERT INTO series(name) VALUES (?)', (series,)).lastrowid
|
||||
self.conn.execute('INSERT INTO books_series_link(book, series) VALUES (?,?)', (id, aid))
|
||||
if idx:
|
||||
self.set_series_index(id, idx, notify=notify, commit=commit)
|
||||
self.dirtied([id], commit=False)
|
||||
if commit:
|
||||
self.conn.commit()
|
||||
|
||||
@ -7,6 +7,7 @@ __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
import os, traceback, cStringIO, re, shutil
|
||||
from functools import partial
|
||||
|
||||
from calibre.constants import DEBUG
|
||||
from calibre.utils.config import Config, StringConfig, tweaks
|
||||
@ -139,8 +140,7 @@ class SafeFormat(TemplateFormatter):
|
||||
def get_components(template, mi, id, timefmt='%b %Y', length=250,
|
||||
sanitize_func=ascii_filename, replace_whitespace=False,
|
||||
to_lowercase=False):
|
||||
library_order = tweaks['save_template_title_series_sorting'] == 'library_order'
|
||||
tsfmt = title_sort if library_order else lambda x: x
|
||||
tsfmt = partial(title_sort, order=tweaks['save_template_title_series_sorting'])
|
||||
format_args = FORMAT_ARGS.copy()
|
||||
format_args.update(mi.all_non_none_fields())
|
||||
if mi.title:
|
||||
|
||||
@ -427,7 +427,9 @@ class SchemaUpgrade(object):
|
||||
|
||||
def upgrade_version_15(self):
|
||||
'Remove commas from tags'
|
||||
self.conn.execute("UPDATE tags SET name=REPLACE(name, ',', ';')")
|
||||
self.conn.execute("UPDATE OR IGNORE tags SET name=REPLACE(name, ',', ';')")
|
||||
self.conn.execute("UPDATE OR IGNORE tags SET name=REPLACE(name, ',', ';;')")
|
||||
self.conn.execute("UPDATE OR IGNORE tags SET name=REPLACE(name, ',', '')")
|
||||
|
||||
def upgrade_version_16(self):
|
||||
self.conn.executescript('''
|
||||
|
||||
@ -15,7 +15,7 @@ from calibre import isbytestring, force_unicode, fit_image, \
|
||||
prepare_string_for_xml as xml
|
||||
from calibre.utils.ordered_dict import OrderedDict
|
||||
from calibre.utils.filenames import ascii_filename
|
||||
from calibre.utils.config import prefs
|
||||
from calibre.utils.config import prefs, tweaks
|
||||
from calibre.utils.icu import sort_key
|
||||
from calibre.utils.magick import Image
|
||||
from calibre.library.comments import comments_to_html
|
||||
@ -151,7 +151,11 @@ def get_category_items(category, items, restriction, datatype, prefix): # {{{
|
||||
'<div>{1}</div>'
|
||||
'<div>{2}</div></div>')
|
||||
rating, rstring = render_rating(i.avg_rating, prefix)
|
||||
name = xml(i.name)
|
||||
if i.category == 'authors' and \
|
||||
tweaks['categories_use_field_for_author_name'] == 'author_sort':
|
||||
name = xml(i.sort)
|
||||
else:
|
||||
name = xml(i.name)
|
||||
if datatype == 'rating':
|
||||
name = xml(_('%d stars')%int(i.avg_rating))
|
||||
id_ = i.id
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user