merging journal data access

6 files changed, 151 insertions, 101 deletions

diff --git a/activity.py b/activity.py
index fa94eab..278729b 100644
--- a/activity.py
+++ b/activity.py
@@ -30,6 +30,9 @@ import library
 import edit
 import book
 
+import logging
+
+
 class InfoslicerActivity(activity.Activity):
     def __init__(self, handle):
         self.notebook = Gtk.Notebook()
@@ -51,6 +54,9 @@ class InfoslicerActivity(activity.Activity):
 
         self.edit_page = 1
         self.edit = edit.View()
+
+        logging.debug(self.edit)
+
         self.library = library.View(self)
 
         toolbar_box = ToolbarBox()
diff --git a/edit.py b/edit.py
index 2789b48..f3c8fe6 100644
--- a/edit.py
+++ b/edit.py
@@ -32,11 +32,15 @@ from infoslicer.processing.Article import Article
 
 import book
 
+import logging
+
+
 TABS = (Edit_Pane(),
         Image_Pane(),
         Journal_Image_Pane(),
         Format_Pane())
 
+
 class View(Gtk.Notebook):
     def __init__(self):
         GObject.GObject.__init__(self)
@@ -60,6 +64,8 @@ class View(Gtk.Notebook):
 class ToolbarBuilder():
     def __init__(self, edit, toolbar):
         self.edit = edit
+        logging.debug('init edit toolbar')
+        logging.debug(self.edit)
 
         self.txt_toggle = ToggleToolButton('ascii')
         self.img_toggle = ToggleToolButton('image')
@@ -107,8 +113,8 @@ class ToolbarBuilder():
         self.jimg_toggle.set_sensitive(False)
 
     def _toggle_image_chooser(self, widget):
-        self._old_cursor = self.edit.get_window().get_cursor()
-        self.edit.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
+        # self._old_cursor = self.edit.get_window().get_cursor()
+        # self.edit.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
         GObject.idle_add(self.__image_chooser)
 
     def __image_chooser(self):
@@ -120,11 +126,11 @@ class ToolbarBuilder():
                 title = str(jobject.metadata['title'])
                 path = str(jobject.file_path)
                 TABS[2].gallery.add_image(path, title)
-        self.edit.get_window().set_cursor(self._old_cursor)
+        # self.edit.get_window().set_cursor(self._old_cursor)
 
     def _toggle_text_chooser(self, widget):
-        self._old_cursor = self.edit.get_window().get_cursor()
-        self.edit.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
+        # self._old_cursor = self.edit.get_window().get_cursor()
+        # self.edit.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
         GObject.idle_add(self.__text_chooser)
 
     def __text_chooser(self):
@@ -140,7 +146,7 @@ class ToolbarBuilder():
                 fp.close()
                 article_data = dehtml(text, title)
                 TABS[0].set_source_article(Article(article_data))
-        self.edit.get_window().set_cursor(self._old_cursor)
+        # self.edit.get_window().set_cursor(self._old_cursor)
 
     def _toggle_cb(self, widget, toggles):
         for tab in TABS:
diff --git a/infoslicer/widgets/Journal_Gallery_View.py b/infoslicer/widgets/Journal_Gallery_View.py
index e18cf11..5358d05 100644
--- a/infoslicer/widgets/Journal_Gallery_View.py
+++ b/infoslicer/widgets/Journal_Gallery_View.py
@@ -23,7 +23,7 @@ from Editable_Textbox import Editable_Textbox
 from infoslicer.processing.Article_Data import *
 from infoslicer.processing.Article import Article
 import book
-from infoslicer.processing import Journal_Getter as journal
+# from infoslicer.processing import Journal_Getter as journal
 
 logger = logging.getLogger('infoslicer')
 
diff --git a/po/InfoSlicer.pot b/po/InfoSlicer.pot
index 44096bf..3250977 100644
--- a/po/InfoSlicer.pot
+++ b/po/InfoSlicer.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-21 01:22-0400\n"
+"POT-Creation-Date: 2013-03-27 08:46-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,32 +21,70 @@ msgstr ""
 msgid "InfoSlicer"
 msgstr ""
 
-#: activity.py:67
-msgid "Library"
+#: activity/activity.info:3
+msgid ""
+"Is it possible to have my own encyclopedia? Yes! Find your favorite "
+"information on the web and package it with InfoSlicer creating incredible "
+"collections."
 msgstr ""
 
-#: activity.py:75
-msgid "Edit"
+#: edit.py:70
+msgid "Text"
 msgstr ""
 
-#: book.py:211
-msgid "Lion (from en.wikipedia.org)"
+#: edit.py:75
+msgid "Images"
 msgstr ""
 
-#: book.py:212
-msgid "Tiger (from en.wikipedia.org)"
+#: edit.py:80
+msgid "Journal Images"
 msgstr ""
 
-#: book.py:213
-msgid "Giraffe (from en.wikipedia.org)"
+#: edit.py:85
+msgid "Choose Journal Images"
 msgstr ""
 
-#: book.py:214
-msgid "Zebra (from en.wikipedia.org)"
+#: edit.py:89
+msgid "Choose Journal Text"
 msgstr ""
 
-#: book.py:221
-msgid "Giraffe"
+#: parse.py:18
+msgid "Return to index"
+msgstr ""
+
+#: net.py:37
+#, python-format
+msgid "\"%s\" download in progress..."
+msgstr ""
+
+#: net.py:40
+#, python-format
+msgid "Processing \"%s\"..."
+msgstr ""
+
+#: net.py:44
+#, python-format
+msgid "Downloading \"%s\" images..."
+msgstr ""
+
+#: net.py:45
+#, python-format
+msgid " (from %s)"
+msgstr ""
+
+#: net.py:47
+#, python-format
+msgid "\"%s\" successfully downloaded"
+msgstr ""
+
+#: net.py:51
+#, python-format
+msgid "\"%s\" could not be found"
+msgstr ""
+
+#: net.py:55
+#, python-format
+msgid "Error downloading \"%s\"; check your connection"
 msgstr ""
 
 #: bookview.py:52
@@ -72,46 +111,32 @@ msgstr ""
 msgid "New article"
 msgstr ""
 
-#: edit.py:58
-msgid "Text"
-msgstr ""
-
-#: edit.py:63
-msgid "Images"
-msgstr ""
-
-#: infoslicer/widgets/Edit_Pane.py:53
-msgid "Snap selection to:"
-msgstr ""
-
-#: infoslicer/widgets/Edit_Pane.py:54
-msgid "Nothing"
+#: activity.py:67
+msgid "Library"
 msgstr ""
 
-#: infoslicer/widgets/Edit_Pane.py:55
-msgid "Sentences"
+#: activity.py:75
+msgid "Edit"
 msgstr ""
 
-#: infoslicer/widgets/Edit_Pane.py:56
-msgid "Paragraphs"
+#: book.py:211
+msgid "Lion (from en.wikipedia.org)"
 msgstr ""
 
-#: infoslicer/widgets/Edit_Pane.py:57
-msgid "Sections"
+#: book.py:212
+msgid "Tiger (from en.wikipedia.org)"
 msgstr ""
 
-#: infoslicer/widgets/Edit_Pane.py:103 infoslicer/widgets/Edit_Pane.py:111
-#: infoslicer/widgets/Format_Pane.py:52 infoslicer/widgets/Image_Pane.py:58
-#: infoslicer/widgets/Image_Pane.py:89
-msgid "Article:"
+#: book.py:213
+msgid "Giraffe (from en.wikipedia.org)"
 msgstr ""
 
-#: infoslicer/widgets/Image_Pane.py:79
-msgid "This article does not have any images"
+#: book.py:214
+msgid "Zebra (from en.wikipedia.org)"
 msgstr ""
 
-#: infoslicer/widgets/Image_Pane.py:82
-msgid "Please select a Wikipedia article from the menu above"
+#: book.py:221
+msgid "Giraffe"
 msgstr ""
 
 #: library.py:50
@@ -182,54 +207,19 @@ msgid "Simple English Wikipedia"
 msgstr ""
 
 #: library.py:241
-msgid "German Wikipedia"
+msgid "French Wikipedia"
 msgstr ""
 
 #: library.py:242
-msgid "Spanish Wikipedia"
+msgid "German Wikipedia"
 msgstr ""
 
 #: library.py:243
-msgid "French Wikipedia"
-msgstr ""
-
-#: net.py:37
-#, python-format
-msgid "\"%s\" download in progress..."
-msgstr ""
-
-#: net.py:40
-#, python-format
-msgid "Processing \"%s\"..."
-msgstr ""
-
-#: net.py:44
-#, python-format
-msgid "Downloading \"%s\" images..."
-msgstr ""
-
-#: net.py:45
-#, python-format
-msgid " (from %s)"
-msgstr ""
-
-#: net.py:47
-#, python-format
-msgid "\"%s\" successfully downloaded"
-msgstr ""
-
-#: net.py:51
-#, python-format
-msgid "\"%s\" could not be found"
+msgid "Polish Wikipedia"
 msgstr ""
 
-#: net.py:55
-#, python-format
-msgid "Error downloading \"%s\"; check your connection"
-msgstr ""
-
-#: parse.py:18
-msgid "Return to index"
+#: library.py:244
+msgid "Spanish Wikipedia"
 msgstr ""
 
 #: xol.py:50
@@ -258,3 +248,38 @@ msgstr ""
 msgid ""
 "You can read the book in Browse or access the .xol file from your Journal"
 msgstr ""
+
+#: infoslicer/widgets/Journal_Image_Pane.py:59
+#: infoslicer/widgets/Image_Pane.py:58 infoslicer/widgets/Image_Pane.py:89
+#: infoslicer/widgets/Format_Pane.py:52 infoslicer/widgets/Edit_Pane.py:103
+#: infoslicer/widgets/Edit_Pane.py:111
+msgid "Article:"
+msgstr ""
+
+#: infoslicer/widgets/Image_Pane.py:79
+msgid "This article does not have any images"
+msgstr ""
+
+#: infoslicer/widgets/Image_Pane.py:82
+msgid "Please select a Wikipedia article from the menu above"
+msgstr ""
+
+#: infoslicer/widgets/Edit_Pane.py:53
+msgid "Snap selection to:"
+msgstr ""
+
+#: infoslicer/widgets/Edit_Pane.py:54
+msgid "Nothing"
+msgstr ""
+
+#: infoslicer/widgets/Edit_Pane.py:55
+msgid "Sentences"
+msgstr ""
+
+#: infoslicer/widgets/Edit_Pane.py:56
+msgid "Paragraphs"
+msgstr ""
+
+#: infoslicer/widgets/Edit_Pane.py:57
+msgid "Sections"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index f5c08cf..6d1b6cd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -236,15 +236,27 @@ msgstr "Mover artículo hacia arriba"
 msgid "New article"
 msgstr "Nuevo artículo"
 
-#: edit.py:58
+#: edit.py:70
 msgid "Text"
 msgstr "Texto"
 
-#: edit.py:63
+#: edit.py:75
 msgid "Images"
 msgstr "Imágenes"
 
-#: infoslicer/widgets/Edit_Pane.py:53
+#: edit.py:80
+msgid "Journal Images"
+msgstr "Imágenes del Diario"
+
+#: edit.py:85
+msgid "Choose Journal Images"
+msgstr "Eliger las imágenes del Diario"
+
+#: edit.py:89
+msgid "Choose Journal Text"
+msgstr "Eliger el texto del Diario"
+
+#: Infoslicer/widgets/Edit_Pane.py:53
 msgid "Snap selection to:"
 msgstr "Ajustar/alinear la selección a:"
 
@@ -348,17 +360,21 @@ msgid "Simple English Wikipedia"
 msgstr "Wikipedia en inglés sencillo"
 
 #: library.py:241
+msgid "French Wikipedia"
+msgstr "Wikipedia en francés"
+
+#: library.py:242
 msgid "German Wikipedia"
 msgstr "Wikipedia en alemán"
 
-#: library.py:242
+#: library.py:243
+msgid "Polish Wikipedia"
+msgstr "Wikipedia en polaco"
+
+#: library.py:244
 msgid "Spanish Wikipedia"
 msgstr "Wikipedia en español"
 
-#: library.py:243
-msgid "French Wikipedia"
-msgstr "Wikipedia en francés"
-
 #: net.py:37
 #, python-format
 msgid "\"%s\" download in progress..."
diff --git a/po/hus.po b/po/hus.po
index 760096d..48353f2 100644
--- a/po/hus.po
+++ b/po/hus.po
@@ -273,6 +273,3 @@ msgstr ""
 
 #~ msgid "A bundle for current object was already created. "
 #~ msgstr "Juni t'i'él abal ax'é xi eyextaláb k'wajat ts'ejkadhits. "
-
-#~ msgid "Bundle exists"
-#~ msgstr "T'i'él xi wa'tsits"