From 2014954ed4e3b1e69be0538dc9d0cdb4ba6c58ff Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Sun, 31 Mar 2013 23:35:55 +0000 Subject: restore after failed merge --- diff --git a/NEWS b/NEWS index 3abf784..4b35223 100644 --- a/NEWS +++ b/NEWS @@ -1,11 +1,3 @@ -17 - -ENHANCEMENTS: -* Load text from Sugar Journal (w/ Aneesh Dogra) -* Load images from Sugar Journal (w/ Aneesh Dogra) -* Add Polish wikipedia to library (w/ ) -* New translations - 15 ENHANCEMENT: diff --git a/activity.py b/activity.py index 278729b..fa94eab 100644 --- a/activity.py +++ b/activity.py @@ -30,9 +30,6 @@ import library import edit import book -import logging - - class InfoslicerActivity(activity.Activity): def __init__(self, handle): self.notebook = Gtk.Notebook() @@ -54,9 +51,6 @@ 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/activity/activity.info b/activity/activity.info index fbd30c2..5ba8956 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = InfoSlicer -activity_version = 17 +activity_version = 15 host_version = 1 icon = slicelogo bundle_id = org.sugarlabs.InfoSlicer diff --git a/edit.py b/edit.py index 83a66df..f3c8fe6 100644 --- a/edit.py +++ b/edit.py @@ -61,10 +61,11 @@ class View(Gtk.Notebook): if book.custom.article: TABS[index].set_working_article(book.custom.article) - 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') diff --git a/library.py b/library.py index bd6c08e..920c819 100644 --- a/library.py +++ b/library.py @@ -37,15 +37,6 @@ from infoslicer.widgets.Reading_View import Reading_View logger = logging.getLogger('infoslicer') - -WIKI = { _('English Wikipedia') : 'en.wikipedia.org', - _('Simple English Wikipedia') : 'simple.wikipedia.org', - _('French Wikipedia') : 'fr.wikipedia.org', - _('German Wikipedia') : 'de.wikipedia.org', - _('Polish Wikipedia') : 'pl.wikipedia.org', - _('Spanish Wikipedia') : 'es.wikipedia.org'} - - class View(Gtk.EventBox): def sync(self): self.wiki.sync() @@ -139,11 +130,14 @@ class View(Gtk.EventBox): custom.props.show_tabs = False custom.append_page(custom_stub, None) custom.append_page(custom_widget, None) + # custom.set_size_request(Gdk.Screen.width()/4*3, + # Gdk.Screen.height()/2 - 55) custom.set_size_request(int(Gdk.Screen.width() * 3 / 4.), int((Gdk.Screen.height() - \ style.GRID_CELL_SIZE) / 2)) # workspace + articles_box = Gtk.HBox() articles_box.pack_start(self.wiki, True, True, 0) articles_box.pack_start(Gtk.VSeparator(), False, False, 0) @@ -162,6 +156,7 @@ class View(Gtk.EventBox): self.add(workspace) # init components + book.wiki.connect('article-selected', self._article_selected_cb, wiki_widget, [wiki, custom]) book.wiki.connect('article-deleted', self._article_deleted_cb, @@ -243,3 +238,10 @@ class ToolbarBuilder(): def _publish_clicked_cb(self, widget): xol.publish(self.activity) + +WIKI = { _('English Wikipedia') : 'en.wikipedia.org', + _('Simple English Wikipedia') : 'simple.wikipedia.org', + _('French Wikipedia') : 'fr.wikipedia.org', + _('German Wikipedia') : 'de.wikipedia.org', + _('Polish Wikipedia') : 'pl.wikipedia.org', + _('Spanish Wikipedia') : 'es.wikipedia.org'} diff --git a/po/InfoSlicer.pot b/po/InfoSlicer.pot index 3250977..231eb20 100644 --- a/po/InfoSlicer.pot +++ b/po/InfoSlicer.pot @@ -8,83 +8,52 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-27 08:46-0400\n" +"POT-Creation-Date: 2012-11-15 00:33-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: activity/activity.info:2 +#. TRANS: "name" option from activity.info file msgid "InfoSlicer" msgstr "" -#: activity/activity.info:3 +#. TRANS: "summary" option from activity.info file +#. TRANS: "description" option from activity.info file 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 "" -#: edit.py:70 -msgid "Text" -msgstr "" - -#: edit.py:75 -msgid "Images" -msgstr "" - -#: edit.py:80 -msgid "Journal Images" -msgstr "" - -#: edit.py:85 -msgid "Choose Journal Images" -msgstr "" - -#: edit.py:89 -msgid "Choose Journal Text" -msgstr "" - -#: parse.py:18 -msgid "Return to index" -msgstr "" - -#: net.py:37 -#, python-format -msgid "\"%s\" download in progress..." +#: activity.py:67 +msgid "Library" msgstr "" -#: net.py:40 -#, python-format -msgid "Processing \"%s\"..." +#: activity.py:75 +msgid "Edit" msgstr "" -#: net.py:44 -#, python-format -msgid "Downloading \"%s\" images..." +#: book.py:211 +msgid "Lion (from en.wikipedia.org)" msgstr "" -#: net.py:45 -#, python-format -msgid " (from %s)" +#: book.py:212 +msgid "Tiger (from en.wikipedia.org)" msgstr "" -#: net.py:47 -#, python-format -msgid "\"%s\" successfully downloaded" +#: book.py:213 +msgid "Giraffe (from en.wikipedia.org)" msgstr "" -#: net.py:51 -#, python-format -msgid "\"%s\" could not be found" +#: book.py:214 +msgid "Zebra (from en.wikipedia.org)" msgstr "" -#: net.py:55 -#, python-format -msgid "Error downloading \"%s\"; check your connection" +#: book.py:221 +msgid "Giraffe" msgstr "" #: bookview.py:52 @@ -111,32 +80,46 @@ msgstr "" msgid "New article" msgstr "" -#: activity.py:67 -msgid "Library" +#: edit.py:58 +msgid "Text" msgstr "" -#: activity.py:75 -msgid "Edit" +#: edit.py:63 +msgid "Images" msgstr "" -#: book.py:211 -msgid "Lion (from en.wikipedia.org)" +#: infoslicer/widgets/Edit_Pane.py:53 +msgid "Snap selection to:" msgstr "" -#: book.py:212 -msgid "Tiger (from en.wikipedia.org)" +#: infoslicer/widgets/Edit_Pane.py:54 +msgid "Nothing" msgstr "" -#: book.py:213 -msgid "Giraffe (from en.wikipedia.org)" +#: infoslicer/widgets/Edit_Pane.py:55 +msgid "Sentences" msgstr "" -#: book.py:214 -msgid "Zebra (from en.wikipedia.org)" +#: infoslicer/widgets/Edit_Pane.py:56 +msgid "Paragraphs" msgstr "" -#: book.py:221 -msgid "Giraffe" +#: infoslicer/widgets/Edit_Pane.py:57 +msgid "Sections" +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:" +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 "" #: library.py:50 @@ -207,19 +190,54 @@ msgid "Simple English Wikipedia" msgstr "" #: library.py:241 -msgid "French Wikipedia" +msgid "German Wikipedia" msgstr "" #: library.py:242 -msgid "German Wikipedia" +msgid "Spanish Wikipedia" msgstr "" #: library.py:243 -msgid "Polish Wikipedia" +msgid "French Wikipedia" msgstr "" -#: library.py:244 -msgid "Spanish Wikipedia" +#: 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 "" + +#: parse.py:18 +msgid "Return to index" msgstr "" #: xol.py:50 @@ -248,38 +266,3 @@ 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 6d1b6cd..f5c08cf 100644 --- a/po/es.po +++ b/po/es.po @@ -236,27 +236,15 @@ msgstr "Mover artículo hacia arriba" msgid "New article" msgstr "Nuevo artículo" -#: edit.py:70 +#: edit.py:58 msgid "Text" msgstr "Texto" -#: edit.py:75 +#: edit.py:63 msgid "Images" msgstr "Imágenes" -#: 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 +#: infoslicer/widgets/Edit_Pane.py:53 msgid "Snap selection to:" msgstr "Ajustar/alinear la selección a:" @@ -360,21 +348,17 @@ 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:243 -msgid "Polish Wikipedia" -msgstr "Wikipedia en polaco" - -#: library.py:244 +#: library.py:242 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 48353f2..760096d 100644 --- a/po/hus.po +++ b/po/hus.po @@ -273,3 +273,6 @@ 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" -- cgit v0.9.1