From f53c5f3916c6065f49e1de1e05cddf1918efd19d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jun 2009 17:07:12 -0700
Subject: [PATCH 1/5] Fix #2574 (Cannot Maximize Calibre Anymore)

---
 src/calibre/gui2/main.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 7766c61fe5..f641e6f64e 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -477,8 +477,9 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
         else:
             self.status_bar.cover_flow_button.disable(pictureflowerror)
 
-
-        self.setMaximumHeight(max_available_height())
+        self._calculated_available_height = min(max_available_height()-15,
+                self.height())
+        self.resize(self.width(), self._calculated_available_height)
 
 
         if config['autolaunch_server']:
@@ -610,7 +611,8 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
             else:
                 self.cover_flow.setVisible(False)
                 #self.status_bar.book_info.book_data.setMaximumHeight(1000)
-            self.setMaximumHeight(available_height())
+            self.resize(self.width(), self._calculated_available_height)
+            #self.setMaximumHeight(available_height())
 
     def toggle_tags_view(self, show):
         if show:

From 37898b16a5bf33fbda31e32d00157f827055481e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jun 2009 17:07:35 -0700
Subject: [PATCH 2/5] Fix #2684 (Icon missing in Tag Editor dialog)

---
 src/calibre/gui2/images/back.svg    | 447 ++++++++++------------------
 src/calibre/gui2/images/forward.svg | 429 ++++++++++----------------
 2 files changed, 320 insertions(+), 556 deletions(-)

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

From d80dbdc17c22df391247db5a5dde9838e82ad581 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jun 2009 17:26:51 -0700
Subject: [PATCH 3/5] Fix #2711 (Multi-Level Toc failure)

---
 src/calibre/ebooks/oeb/transforms/structure.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/oeb/transforms/structure.py b/src/calibre/ebooks/oeb/transforms/structure.py
index 468ba61ff0..21be375b1a 100644
--- a/src/calibre/ebooks/oeb/transforms/structure.py
+++ b/src/calibre/ebooks/oeb/transforms/structure.py
@@ -149,7 +149,7 @@ class DetectStructure(object):
                     #node.add(_('Top'), _href)
             if self.opts.level2_toc is not None:
                 added2 = {}
-                level2 = list(XPath(self.opts.level2_toc)(item.data))
+                level2 = list(XPath(self.opts.level2_toc)(document.data))
                 for elem in level2:
                     level1 = None
                     for item in document.data.iterdescendants():
@@ -162,7 +162,7 @@ class DetectStructure(object):
                                 added2[elem] = level1.add(text, _href,
                                     play_order=self.oeb.toc.next_play_order())
                 if self.opts.level3_toc is not None:
-                    level3 = list(XPath(self.opts.level3_toc)(item.data))
+                    level3 = list(XPath(self.opts.level3_toc)(document.data))
                     for elem in level3:
                         level2 = None
                         for item in document.data.iterdescendants():

From 021f4be8369b5f7efa001b3dbd04db5d9711c727 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jun 2009 17:35:52 -0700
Subject: [PATCH 4/5] ...

---
 src/calibre/gui2/viewer/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index d81a24223b..ccf215210c 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -309,7 +309,7 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         m = bm[1].split('#')
         if len(m) > 1:
             spine_index, m = int(m[0]), m[1]
-            if self.current_index == spine_index:
+            if spine_index > -1 and self.current_index == spine_index:
                 self.view.goto_bookmark(m)
             else:
                 self.pending_bookmark = bm

From a7f2925249687cdbc79cf053661526cf7ce361b2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Jun 2009 17:37:11 -0700
Subject: [PATCH 5/5] beta 9

---
 src/calibre/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index b61169cef2..d5e25661dd 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.6.0b8'
+__version__   = '0.6.0b9'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re