modified: GetIABooksActivity.py

modified:   activity/get-ia-books.svg
Make new icon, add format combo box to books toolbar.

2 files changed, 153 insertions, 343 deletions

diff --git a/GetIABooksActivity.py b/GetIABooksActivity.py
index bb802c4..f7719f1 100755
--- a/GetIABooksActivity.py
+++ b/GetIABooksActivity.py
@@ -78,7 +78,6 @@ class BooksToolbar(gtk.Toolbar):
         self._download.show()
 
         self.format_combo = ComboBox()
-        # self.format_combo.connect('changed', self.format_changed_cb)
         self.format_combo.append_item('djvu', 'Deja Vu')
         self.format_combo.append_item('pdf', 'PDF')
         self.format_combo.set_active(0)
@@ -206,16 +205,17 @@ class GetIABooksActivity(activity.Activity):
         
         self.progressbar = gtk.ProgressBar()
         self.progressbar.set_orientation(gtk.PROGRESS_LEFT_TO_RIGHT)
+        self.progressbar.set_fraction(0.0)
         
         vbox = gtk.VBox()
+        vbox.pack_start(self.progressbar,  False,  False,  10)
         vbox.pack_start(self.scrolled)
-        vbox.pack_start(self.progressbar,  False,  False)
         vbox.pack_end(self.list_scroller)
         self.set_canvas(vbox)
         tv.show()
         vbox.show()
         self.list_scroller.show()
-        self.progressbar.show()
+        self.progressbar.hide()
 
         self.toolbox.set_current_toolbar(_TOOLBAR_BOOKS)
         self._books_toolbar.search_entry.grab_focus()
@@ -244,7 +244,8 @@ class GetIABooksActivity(activity.Activity):
             label_text +=  _('Language') +': '+ model.get_value(iter,COLUMN_LANGUAGE) + '\n\n'
             self.download_url =   'http://www.archive.org/download/' 
             identifier = model.get_value(iter,COLUMN_IDENTIFIER)
-            self.download_url +=  identifier + '/' + identifier + '.djvu'
+            format = self._books_toolbar.format_combo.props.value
+            self.download_url +=  identifier + '/' + identifier + '.' + format
             label_text +=  _('Download URL') + ': ' + self.download_url
             textbuffer = self.textview.get_buffer()
             textbuffer.set_text(label_text)
@@ -264,15 +265,17 @@ class GetIABooksActivity(activity.Activity):
             return
         FL = urllib.quote('fl[]')
         SORT = urllib.quote('sort[]')
-        search_url = 'http://www.archive.org/advancedsearch.php?q=' +  \
+        self.search_url = 'http://www.archive.org/advancedsearch.php?q=' +  \
             urllib.quote('(title:(' + search_text.lower() + ') OR creator:(' + search_text.lower() +')) AND format:(DJVU)')
-        search_url += '&' + FL + '=creator&' + FL + '=description&' + FL + '=format&' + FL + '=identifier&' + FL + '=language'
-        search_url += '&' + FL +  '=publisher&' + FL + '=subject&' + FL + '=title&' + FL + '=volume'
-        search_url += '&' + SORT + '=title&' + SORT + '&' + SORT + '=&rows=500&save=yes&fmt=csv&xmlsearch=Search'
-        gobject.idle_add(self.download_csv,  search_url)
+        self.search_url += '&' + FL + '=creator&' + FL + '=description&' + FL + '=format&' + FL + '=identifier&'  \
+            + FL + '=language'
+        self.search_url += '&' + FL +  '=publisher&' + FL + '=subject&' + FL + '=title&' + FL + '=volume'
+        self.search_url += '&' + SORT + '=title&' + SORT + '&' + SORT + '=&rows=500&save=yes&fmt=csv&xmlsearch=Search'
+        gobject.idle_add(self.download_csv,  self.search_url)
     
     def get_book(self):
         self._books_toolbar._enable_button(False)
+        self.progressbar.show()
         gobject.idle_add(self.download_book,  self.download_url)
         
     def download_csv(self,  url):
@@ -320,6 +323,9 @@ class GetIABooksActivity(activity.Activity):
         reader = csv.reader(open(tempfile,  'rb'))
         reader.next() # skip the first header row.
         for row in reader:
+            if len(row) < 9:
+                _alert("Server Error",  self.search_url)
+                return
             iter = self.ls.append()
             self.ls.set(iter, 0, row[0],  1,  row[1],  2,  row[2],  3,  row[3],  4,  row[4],  5,  row[5],  \
                         6,  row[6],  7,  row[7],  8,  row[8])
@@ -398,6 +404,7 @@ class GetIABooksActivity(activity.Activity):
         journal_entry.file_path = tempfile
         datastore.write(journal_entry)
         os.remove(tempfile)
+        self.progressbar.hide()
         self._alert(_('Success'), self.selected_title + _(' added to Journal.'))
 
     def truncate(self,  str,  length):
diff --git a/activity/get-ia-books.svg b/activity/get-ia-books.svg
index d6e0560..179a127 100755
--- a/activity/get-ia-books.svg
+++ b/activity/get-ia-books.svg
@@ -9,342 +9,145 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2425"
+   enable-background="new 0 0 55 55"
+   height="55px"
+   version="1.1"
+   viewBox="0 0 55 55"
+   width="55px"
+   x="0px"
+   xml:space="preserve"
+   y="0px"
+   id="svg2441"
    sodipodi:version="0.32"
    inkscape:version="0.46"
-   sodipodi:docname="get-ia-books.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2427">
-    <inkscape:perspective
-       id="perspective2565"
-       inkscape:persp3d-origin="20.428571 : 16.714286 : 1"
-       inkscape:vp_z="44.428571 : 24.714286 : 1"
-       inkscape:vp_y="6.1230318e-14 : 1000 : 0"
-       inkscape:vp_x="-3.5714286 : 24.714286 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
+   sodipodi:docname="get-ia-books-2.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+     id="metadata2455"><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><defs
+     id="defs2453"><inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="6.1230318e-14 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective2433" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="3"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1152"
+       inkscape:vp_x="0 : 27.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="55 : 27.5 : 1"
+       inkscape:persp3d-origin="27.5 : 18.333333 : 1"
+       id="perspective2457" /></defs><sodipodi:namedview
      inkscape:window-height="815"
+     inkscape:window-width="1152"
+     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"
+     showgrid="false"
+     inkscape:zoom="1"
+     inkscape:cx="40.493087"
+     inkscape:cy="23.964466"
      inkscape:window-x="-4"
-     inkscape:window-y="-4" />
-  <metadata
-     id="metadata2430">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#ffffff;fill-opacity:0"
-       id="rect2567"
-       width="22.428572"
-       height="17.714285"
-       x="5.2857141"
-       y="10.857142" /> 
-    <g
-       sodipodi:type="inkscape:box3d"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;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;enable-background:accumulate"
-       id="g4843"
-       inkscape:perspectiveID="#perspective2433"
-       inkscape:corner0="1.0487805 : 0.00097560975 : 0 : 1"
-       inkscape:corner7="0.11258278 : -0.0072582781 : 2.2652118 : 1">
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4853"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="13"
-         d="M 11.714286,31.447493 L 21.571429,37.714286 L 39.29492,28.517231 L 30.767363,27.536928 L 11.714286,31.447493 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4845"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="6"
-         d="M 11.714286,27.428571 L 11.714286,31.447493 L 30.767363,27.536928 L 30.767363,25.628281 L 11.714286,27.428571 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4855"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="11"
-         d="M 30.767363,25.628281 L 39.29492,26.079579 L 39.29492,28.517231 L 30.767363,27.536928 L 30.767363,25.628281 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4847"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="5"
-         d="M 11.714286,27.428571 L 21.571429,30.313589 L 39.29492,26.079579 L 30.767363,25.628281 L 11.714286,27.428571 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4851"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="14"
-         d="M 21.571429,30.313589 L 21.571429,37.714286 L 39.29492,28.517231 L 39.29492,26.079579 L 21.571429,30.313589 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4849"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="3"
-         d="M 11.714286,27.428571 L 21.571429,30.313589 L 21.571429,37.714286 L 11.714286,31.447493 L 11.714286,27.428571 z" />
-    </g>
-    <g
-       sodipodi:type="inkscape:box3d"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;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;enable-background:accumulate"
-       id="g4857"
-       inkscape:perspectiveID="#perspective2433"
-       inkscape:corner0="0.1586207 : 0.0082450305 : 0 : 1"
-       inkscape:corner7="0.88764044 : 0.0021424212 : 1.6407706 : 1">
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4867"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="13"
-         d="M 20.714286,29.055648 L 12.714286,27.103122 L 29.122738,25.660118 L 36.706904,26.092447 L 20.714286,29.055648 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4865"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="14"
-         d="M 12.714286,23.870192 L 12.714286,27.103122 L 29.122738,25.660118 L 29.122738,23.930555 L 12.714286,23.870192 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4869"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="11"
-         d="M 36.706904,23.91247 L 29.122738,23.930555 L 29.122738,25.660118 L 36.706904,26.092447 L 36.706904,23.91247 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4861"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="5"
-         d="M 20.714286,23.788515 L 12.714286,23.870192 L 29.122738,23.930555 L 36.706904,23.91247 L 20.714286,23.788515 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4859"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="6"
-         d="M 20.714286,23.788515 L 20.714286,29.055648 L 36.706904,26.092447 L 36.706904,23.91247 L 20.714286,23.788515 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4863"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="3"
-         d="M 20.714286,23.788515 L 12.714286,23.870192 L 12.714286,27.103122 L 20.714286,29.055648 L 20.714286,23.788515 z" />
-    </g>
-    <g
-       sodipodi:type="inkscape:box3d"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:square;stroke-linejoin:bevel;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;enable-background:accumulate"
-       id="g4913"
-       inkscape:perspectiveID="#perspective2433"
-       inkscape:corner0="3.3076923 : 0.011692308 : 0 : 1"
-       inkscape:corner7="0.36585366 : -0.013463414 : 0.25 : 1">
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4923"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:square;stroke-linejoin:bevel;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;enable-background:accumulate"
-         inkscape:box3dsidetype="13"
-         d="M 5.5714286,28.982578 L 17.571429,39.714285 L 22.279245,37.283018 L 7.8987342,28.709272 L 5.5714286,28.982578 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4915"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:square;stroke-linejoin:bevel;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;enable-background:accumulate"
-         inkscape:box3dsidetype="6"
-         d="M 5.5714286,23.142857 L 5.5714286,28.982578 L 7.8987342,28.709272 L 7.8987342,23.189873 L 5.5714286,23.142857 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4925"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:square;stroke-linejoin:bevel;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;enable-background:accumulate"
-         inkscape:box3dsidetype="11"
-         d="M 7.8987342,23.189873 L 22.279245,21.714949 L 22.279245,37.283018 L 7.8987342,28.709272 L 7.8987342,23.189873 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4917"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:square;stroke-linejoin:bevel;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;enable-background:accumulate"
-         inkscape:box3dsidetype="5"
-         d="M 5.5714286,23.142857 L 17.571429,21.296703 L 22.279245,21.714949 L 7.8987342,23.189873 L 5.5714286,23.142857 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4921"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:square;stroke-linejoin:bevel;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;enable-background:accumulate"
-         inkscape:box3dsidetype="14"
-         d="M 17.571429,21.296703 L 17.571429,39.714285 L 22.279245,37.283018 L 22.279245,21.714949 L 17.571429,21.296703 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4919"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:square;stroke-linejoin:bevel;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;enable-background:accumulate"
-         inkscape:box3dsidetype="3"
-         d="M 5.5714286,23.142857 L 17.571429,21.296703 L 17.571429,39.714285 L 5.5714286,28.982578 L 5.5714286,23.142857 z" />
-    </g>
-    <g
-       sodipodi:type="inkscape:box3d"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;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;enable-background:accumulate"
-       id="g4989"
-       inkscape:perspectiveID="#perspective2433"
-       inkscape:corner0="2.1111111 : 0.0053333333 : 0 : 1"
-       inkscape:corner7="0.73195876 : -0.0041237114 : 0.032633998 : 1">
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4999"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="13"
-         d="M 7.7142857,27.896907 L 13.857143,31 L 14.488574,30.870544 L 8.1324761,27.856455 L 7.7142857,27.896907 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4991"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="6"
-         d="M 7.7142857,24.857143 L 7.7142857,27.896907 L 8.1324761,27.856455 L 8.1324761,24.848245 L 7.7142857,24.857143 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path5001"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="11"
-         d="M 8.1324761,24.848245 L 14.488574,25.511208 L 14.488574,30.870544 L 8.1324761,27.856455 L 8.1324761,24.848245 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4993"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="5"
-         d="M 7.7142857,24.857143 L 13.857143,25.539683 L 14.488574,25.511208 L 8.1324761,24.848245 L 7.7142857,24.857143 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4997"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="14"
-         d="M 13.857143,25.539683 L 13.857143,31 L 14.488574,30.870544 L 14.488574,25.511208 L 13.857143,25.539683 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path4995"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="3"
-         d="M 7.7142857,24.857143 L 13.857143,25.539683 L 13.857143,31 L 7.7142857,27.896907 L 7.7142857,24.857143 z" />
-    </g>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 24.571429,24.857143 C 24.571429,27.428571 24.571429,27.428571 24.571429,27.428571"
-       id="path5019" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 27.142857,25.142857 C 27.142857,27 27.142857,27 27.142857,27"
-       id="path5021" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 30.285714,24.714286 C 30.285714,26.428571 30.285714,26.428571 30.285714,26.428571"
-       id="path5023" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffffff;fill-opacity:1;stroke:&stroke_color;;stroke-linecap:square;stroke-linejoin:bevel;stroke-opacity:1"
-       id="path5025"
-       sodipodi:sides="5"
-       sodipodi:cx="10"
-       sodipodi:cy="30.714286"
-       sodipodi:r1="0.71428571"
-       sodipodi:r2="0.35714286"
-       sodipodi:arg1="0.64350111"
-       sodipodi:arg2="1.2718196"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 10.571429,31.142858 L 10.105194,31.055586 L 9.7689855,31.390184 L 9.7079116,30.919799 L 9.2857966,30.703443 L 9.7142857,30.500001 L 9.7896125,30.031688 L 10.115507,30.376338 L 10.584177,30.303262 L 10.357102,30.719709 L 10.571429,31.142858 z" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 32.714286,24.857143 C 32.714286,26 32.714286,26 32.714286,26 L 32.714286,26.142857"
-       id="path5027" />
-    <g
-       sodipodi:type="inkscape:box3d"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;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;enable-background:accumulate"
-       id="g5029"
-       inkscape:perspectiveID="#perspective2433"
-       inkscape:corner0="0.52727273 : 0.021963636 : 0 : 1"
-       inkscape:corner7="-0.01754386 : 0.014175438 : 0.044854178 : 1">
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path5041"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="11"
-         d="M 16.635426,15.117997 L 25.457742,10.407577 L 25.457742,17.988732 L 16.635426,20.071921 L 16.635426,15.117997 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path5031"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="6"
-         d="M 15.714286,14.857143 L 15.714286,19.956558 L 16.635426,20.071921 L 16.635426,15.117997 L 15.714286,14.857143 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path5033"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="5"
-         d="M 15.714286,14.857143 L 24.428571,9.7870134 L 25.457742,10.407577 L 16.635426,15.117997 L 15.714286,14.857143 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path5039"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="13"
-         d="M 15.714286,19.956558 L 24.428571,17.714286 L 25.457742,17.988732 L 16.635426,20.071921 L 15.714286,19.956558 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path5037"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="14"
-         d="M 24.428571,9.7870134 L 24.428571,17.714286 L 25.457742,17.988732 L 25.457742,10.407577 L 24.428571,9.7870134 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path5035"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;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;enable-background:accumulate"
-         inkscape:box3dsidetype="3"
-         d="M 15.714286,14.857143 L 24.428571,9.7870134 L 24.428571,17.714286 L 15.714286,19.956558 L 15.714286,14.857143 z" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:&stroke_color;;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Garamond;-inkscape-font-specification:Garamond"
-       x="31.142857"
-       y="19.714287"
-       id="text5055"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan5057"
-         x="31.142857"
-         y="19.714287">A</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;fill:&stroke_color;;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Garamond;-inkscape-font-specification:Garamond"
-       x="27.428572"
-       y="18"
-       id="text5059"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan5061"
-         x="27.428572"
-         y="18">I</tspan></text>
-  </g>
-</svg>
+     inkscape:window-y="-4"
+     inkscape:current-layer="svg2441" /><g
+     display="block"
+     id="activity-read"
+     transform="matrix(0.9254349,-2.7858121e-3,2.5780978e-3,0.9999961,3.8538887,-1.1596019)"
+     style="display:block">
+	<path
+   d="M 27.904,11.023 L 27.902,11.023 C 27.902,11.021 26.192,8.97 18.526,8.519 C 10.86,8.07 6.843,10.121 6.84,10.122 C 4.942,10.741 3.345,11.857 3.345,13.616 L 3.345,41.318 C 3.345,43.343 4.58,44.812 6.84,44.812 C 6.843,44.812 11.25,43.462 16.844,43.462 C 22.433,43.461 27.905,45.715 27.905,45.715"
+   display="inline"
+   id="path2444"
+   style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.5;stroke-linejoin:round;display:inline" />
+	<path
+   d="M 27.898,11.023 L 27.898,11.023 C 27.898,11.021 29.613,8.97 37.275,8.519 C 44.943,8.07 48.961,10.121 48.963,10.122 C 50.86,10.741 52.457,11.857 52.457,13.616 L 52.457,41.318 C 52.457,43.343 51.224,44.812 48.963,44.812 C 48.96,44.812 44.554,43.462 38.959,43.462 C 33.37,43.461 27.897,45.715 27.897,45.715"
+   display="inline"
+   id="path2446"
+   style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.5;stroke-linejoin:round;display:inline" />
+	
+		<line
+   display="inline"
+   x1="27.898001"
+   x2="27.9"
+   y1="11.023"
+   y2="45.716999"
+   id="line2448"
+   style="fill:none;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;display:inline" />
+	<path
+   d="M 32.566,44.275 C 32.566,44.275 32.535,47.181 27.9,47.181 C 23.268,47.181 23.237,44.275 23.237,44.275"
+   display="inline"
+   id="path2450"
+   style="fill:none;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;display:inline" />
+</g><path
+     sodipodi:type="arc"
+     style="fill:&fill_color;;fill-opacity:1;stroke:&stroke_color;;stroke-linecap:square;stroke-linejoin:bevel;stroke-opacity:1"
+     id="path2461"
+     sodipodi:cx="47.32143"
+     sodipodi:cy="24.642857"
+     sodipodi:rx="7.4404764"
+     sodipodi:ry="7.1428571"
+     d="M 54.761907,24.642857 A 7.4404764,7.1428571 0 1 1 39.880954,24.642857 A 7.4404764,7.1428571 0 1 1 54.761907,24.642857 z"
+     transform="translate(-6.0714286,1.0714286)" /><path
+     sodipodi:type="arc"
+     style="fill:&fill_color;;fill-opacity:1;stroke:&stroke_color;;stroke-linecap:square;stroke-linejoin:bevel;stroke-opacity:1"
+     id="path2471"
+     sodipodi:cx="40.892857"
+     sodipodi:cy="18.630953"
+     sodipodi:rx="0.05952381"
+     sodipodi:ry="0.05952381"
+     d="M 40.95238,18.630953 A 0.05952381,0.05952381 0 0 1 40.84333,18.663971 L 40.892857,18.630953 z"
+     sodipodi:start="0"
+     sodipodi:end="2.55359" /><path
+     sodipodi:type="arc"
+     style="fill:&fill_color;;fill-opacity:1;stroke&stroke_color;;stroke-linecap:square;stroke-linejoin:bevel;stroke-opacity:1"
+     id="path2487"
+     sodipodi:cx="17.023809"
+     sodipodi:cy="24.404762"
+     sodipodi:rx="4.1666665"
+     sodipodi:ry="6.5476189"
+     d="M 16.889564,30.948982 A 4.1666665,6.5476189 0 0 1 17.027402,17.857146 L 17.023809,24.404762 z"
+     sodipodi:start="1.6030208"
+     sodipodi:end="4.7132511"
+     transform="translate(23.809524,1.3095238)" /><path
+     sodipodi:type="arc"
+     style="fill:&fill_color;;fill-opacity:1;stroke:&stroke_color;;stroke-linecap:square;stroke-linejoin:bevel;stroke-opacity:1"
+     id="path2489"
+     sodipodi:cx="17.559525"
+     sodipodi:cy="24.404762"
+     sodipodi:rx="0.41666666"
+     sodipodi:ry="0"
+     d="M 17.5461,24.404762 A 0.41666666,0 0 0 1 17.559884,24.404762 L 17.559525,24.404762 z"
+     sodipodi:start="1.6030208"
+     sodipodi:end="4.7132511" /><path
+     sodipodi:type="arc"
+     style="fill:&fill_color;;fill-opacity:1;stroke:&stroke_color;;stroke-linecap:square;stroke-linejoin:bevel;stroke-opacity:1"
+     id="path2493"
+     sodipodi:cx="-19.285715"
+     sodipodi:cy="9.7619047"
+     sodipodi:rx="5"
+     sodipodi:ry="3.9285715"
+     d="M -19.28607,5.8333333 A 5,3.9285715 0 1 1 -19.381172,13.68976 L -19.285715,9.7619047 z"
+     sodipodi:start="4.712318"
+     sodipodi:end="7.8730742"
+     transform="matrix(0.9467069,0,0,1.707863,59.340989,8.8637183)" /><path
+     style="fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 33.928571,25.595238 C 48.690476,25.714286 48.690476,25.714286 48.690476,25.714286"
+     id="path2497" /><path
+     style="fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1.2372272px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.4162418,25.111256 C 11.798045,25.098483 11.798045,25.098483 11.798045,25.098483"
+     id="path2549" /><path
+     style="fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1.21019578px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.5229025,38.29731 C 11.572335,38.257506 11.572335,38.257506 11.572335,38.257506"
+     id="path2553" /><path
+     style="fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1.24125159px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.1393473,30.031514 C 11.789224,30.022766 11.789224,30.022766 11.789224,30.022766"
+     id="path2555" /><path
+     style="fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1.23114979px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 1.9405635,20.087177 L 16.057775,20.106028"
+     id="path2561" /><path
+     style="fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1.22445309px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5765702,34.344433 C 15.604494,34.36998 15.604494,34.36998 15.604494,34.36998"
+     id="path2563" /><path
+     style="fill:none;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:1.24872255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 2.5072739,13.954383 C 11.811639,13.953105 11.811639,13.953105 11.811639,13.953105"
+     id="path2405" /></svg>