modified: GetIABooksActivity.py

modified:   activity/activity.info
modified:   po/GetIABooks.pot
Fix bug in Activity such that when you request a B/W PDF and it doesn't
exist you can't just ask for another format and try again.

3 files changed, 40 insertions, 32 deletions

diff --git a/GetIABooksActivity.py b/GetIABooksActivity.py
index db2cad8..e6b2f50 100755
--- a/GetIABooksActivity.py
+++ b/GetIABooksActivity.py
@@ -103,7 +103,7 @@ class BooksToolbar(gtk.Toolbar):
     def _get_book_cb(self, button):
         self.activity.get_book()
  
-    def _enable_button(self,  state):
+    def enable_button(self,  state):
         self._download.props.sensitive = state
         self.format_combo.props.sensitive = state
 
@@ -259,10 +259,10 @@ class GetIABooksActivity(activity.Activity):
         format = self._books_toolbar.format_combo.props.value
         textbuffer = self.textview.get_buffer()
         textbuffer.set_text(self.book_data + _('Download URL') + ': ' + self.download_url + format)
-        self._books_toolbar._enable_button(True)
+        self._books_toolbar.enable_button(True)
 
     def find_books(self, search_text):
-        self._books_toolbar._enable_button(False)
+        self._books_toolbar.enable_button(False)
         self.clear_downloaded_bytes()
         textbuffer = self.textview.get_buffer()
         textbuffer.set_text(_('Performing lookup, please wait') + '...')
@@ -284,7 +284,7 @@ class GetIABooksActivity(activity.Activity):
         gobject.idle_add(self.download_csv,  self.search_url)
     
     def get_book(self):
-        self._books_toolbar._enable_button(False)
+        self._books_toolbar.enable_button(False)
         self.progressbar.show()
         format = self._books_toolbar.format_combo.props.value
         gobject.idle_add(self.download_book,  self.download_url + format)
@@ -387,8 +387,12 @@ class GetIABooksActivity(activity.Activity):
         self.progressbar.set_fraction(0.0)
 
     def _get_book_error_cb(self, getter, err):
+        self.treeview.props.sensitive = True
+        self._books_toolbar.enable_button(True)
+        self.progressbar.hide()
         _logger.debug("Error getting document: %s", err)
-        self._alert(_('Error'), _('Could not download ') + self.selected_title + _(' path in catalog may be incorrect.'))
+        self._alert(_('Error'), _('Could not download ') + self.selected_title + _(' path in catalog is incorrect.  ' \
+                                                                                   + '  If you tried to download B/W PDF try another format.'))
         self._download_content_length = 0
         self._download_content_type = None
 
diff --git a/activity/activity.info b/activity/activity.info
index 981eb29..2033618 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -4,5 +4,5 @@ service_name = org.laptop.sugar.GetIABooksActivity
 icon = get-ia-books
 exec = sugar-activity GetIABooksActivity.GetIABooksActivity
 show_launcher = yes
-activity_version = 2
+activity_version = 3
 license = GPLv2+
diff --git a/po/GetIABooks.pot b/po/GetIABooks.pot
index 169e5f4..28cbd9a 100644
--- a/po/GetIABooks.pot
+++ b/po/GetIABooks.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 19:35-0500\n"
+"POT-Creation-Date: 2009-08-11 15:06-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,89 +20,93 @@ msgstr ""
 msgid "Get IA Books"
 msgstr ""
 
-#: GetIABooksActivity.py:74
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:74
 msgid "Get Book"
 msgstr ""
 
-#: GetIABooksActivity.py:150
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:150
 msgid "Books"
 msgstr ""
 
-#: GetIABooksActivity.py:166
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:166
 msgid "Enter words from the Author or Title to begin search"
 msgstr ""
 
-#: GetIABooksActivity.py:188
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:188
 msgid "Title"
 msgstr ""
 
-#: GetIABooksActivity.py:193 GetIABooksActivity.py:242
-#: GetIABooksActivity.py:403
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:193
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:242
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:407
 msgid "Volume"
 msgstr ""
 
-#: GetIABooksActivity.py:201
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:201
 msgid "Author"
 msgstr ""
 
-#: GetIABooksActivity.py:206 GetIABooksActivity.py:252
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:206
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:252
 msgid "Language"
 msgstr ""
 
-#: GetIABooksActivity.py:250
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:250
 msgid "Subject"
 msgstr ""
 
-#: GetIABooksActivity.py:251
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:251
 msgid "Publisher"
 msgstr ""
 
-#: GetIABooksActivity.py:261
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:261
 msgid "Download URL"
 msgstr ""
 
-#: GetIABooksActivity.py:268
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:268
 msgid "Performing lookup, please wait"
 msgstr ""
 
-#: GetIABooksActivity.py:273 GetIABooksActivity.py:305
-#: GetIABooksActivity.py:319 GetIABooksActivity.py:357
-#: GetIABooksActivity.py:391
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:273
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:305
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:319
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:357
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:394
 msgid "Error"
 msgstr ""
 
-#: GetIABooksActivity.py:273
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:273
 msgid "You must enter at least one search word."
 msgstr ""
 
-#: GetIABooksActivity.py:305
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:305
 msgid "Connection timed out for CSV: "
 msgstr ""
 
-#: GetIABooksActivity.py:319
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:319
 msgid "Error getting CSV"
 msgstr ""
 
-#: GetIABooksActivity.py:333
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:333
 msgid "Finished"
 msgstr ""
 
-#: GetIABooksActivity.py:357
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:357
 msgid "Connection timed out for "
 msgstr ""
 
-#: GetIABooksActivity.py:391
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:394
 msgid "Could not download "
 msgstr ""
 
-#: GetIABooksActivity.py:391
-msgid " path in catalog may be incorrect."
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:394
+msgid " path in catalog is incorrect.  "
 msgstr ""
 
-#: GetIABooksActivity.py:423
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:427
 msgid "Success"
 msgstr ""
 
-#: GetIABooksActivity.py:423
+#: /home/jim/olpc/getiabooks/mainline/GetIABooksActivity.py:427
 msgid " added to Journal."
 msgstr ""