erasing catalogs toolbar, approaching mis libros toolbar

2 files changed, 46 insertions, 19 deletions

diff --git a/GetIABooksActivity.py b/GetIABooksActivity.py
index 9859a48..6ea35e7 100644
--- a/GetIABooksActivity.py
+++ b/GetIABooksActivity.py
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-
+# -*- coding: utf-8 -*-
 # Copyright (C) 2009 James D. Simmons
 # Copyright (C) 2009 Sayamindu Dasgupta <sayamindu@laptop.org>
 #
@@ -74,7 +74,7 @@ class GetIABooksActivity(activity.Activity):
     def __init__(self, handle):
         "The entry point to the Activity"
         activity.Activity.__init__(self, handle, False)
-        self.max_participants = 1
+        self.max_participants = 1 # no estamos compartiendo
 
         self.selected_book = None
         self.queryresults = None
@@ -85,7 +85,7 @@ class GetIABooksActivity(activity.Activity):
         self.catalogs_configuration = {}
         self.catalog_history = []
 
-        if os.path.exists('/etc/get-books.cfg'):
+        if os.path.exists('/etc/get-books.cfg'):  # leyendo configuracion   
             self._read_configuration('/etc/get-books.cfg')
         else:
             self._read_configuration()
@@ -101,15 +101,21 @@ class GetIABooksActivity(activity.Activity):
         activity_button.show()
 
         toolbar_box.toolbar.insert(activity_button, 0)
-        self._add_search_controls(toolbar_box.toolbar)
+         
+        self._add_search_controls(toolbar_box.toolbar) # anadiendo busqueda
 
-        separator = Gtk.SeparatorToolItem()
+        separator = Gtk.SeparatorToolItem() # separador
         separator.props.draw = False
         separator.set_expand(True)
         toolbar_box.toolbar.insert(separator, -1)
 
-        toolbar_box.toolbar.insert(StopButton(self), -1)
-
+        toolbar_box.toolbar.insert(StopButton(self), -1) # boton de parado.
+        
+        separator = Gtk.SeparatorToolItem() # separador
+        separator.props.draw = False
+        separator.set_expand(True)
+        toolbar_box.toolbar.insert(separator, -1)
+                
         self.set_toolbar_box(toolbar_box)
         toolbar_box.show_all()
         self._books_toolbar = toolbar_box.toolbar
@@ -254,7 +260,7 @@ class GetIABooksActivity(activity.Activity):
         toolbar.insert(book_search_item, -1)
         book_search_item.show()
 
-        toolbar.source_combo = ComboBox()
+        toolbar.source_combo = ComboBox()   #combo de fuente
         toolbar.source_combo.props.sensitive = True
         toolbar.source_changed_cb_id = \
             toolbar.source_combo.connect('changed', self.__source_changed_cb)
@@ -262,13 +268,34 @@ class GetIABooksActivity(activity.Activity):
         combotool.set_size_request(width, -1)
         toolbar.insert(combotool, -1)
         combotool.show()
+        
+        toolbar.mislibros_toolbarbutton = ToolbarButton()   # boton mis libros
+        toolbar.mislibros_toolbarbutton.props.icon_name = 'preferences-system'  #icono mis libros
+        toolbar.mislibros_toolbarbox = Gtk.Toolbar()
+        toolbar.mislibros_toolbarbutton.props.page = toolbar.mislibros_toolbarbox
+        toolbar.mislibros1_combo = ComboBox()
+        toolbar.mislibros1_combo.props.sensitive = True
+        combotool = ToolComboBox(toolbar.mislibros1_combo)
+        toolbar.mislibros1_combo.append_item('all', _('Any language'))
+        #for key in self.languages.keys():
+		#	toolbar.language_combo.append_item(key, self.languages[key])
+        toolbar.mislibros1_combo.set_active(0)
+        toolbar.mislibros_toolbarbutton.props.page.insert(combotool, -1)
+        toolbar.insert(toolbar.mislibros_toolbarbutton, -1)
+        toolbar.mislibros_toolbarbutton.show()
+        combotool.show()
+        toolbar.mislibros_changed_cb_id = \
+        toolbar.mislibros1_combo.connect('changed',
+                self.__language_changed_cb)
 
-        self.bt_catalogs = ToggleToolButton('books')
-        self.bt_catalogs.set_tooltip(_('Catalogs'))
-        toolbar.insert(self.bt_catalogs, -1)
-        self.bt_catalogs.connect('toggled', self.__toggle_cats_cb)
-        if len(self.catalogs) > 0:
-            self.bt_catalogs.show()
+        
+
+        #self.bt_catalogs = ToggleToolButton('books')
+        #self.bt_catalogs.set_tooltip(_('Catalogs'))
+        #toolbar.insert(self.bt_catalogs, -1)
+        #self.bt_catalogs.connect('toggled', self.__toggle_cats_cb)
+        #if len(self.catalogs) > 0:
+        #    self.bt_catalogs.show()
 
         if len(self.languages) > 0:
             toolbar.config_toolbarbutton = ToolbarButton()
@@ -290,8 +317,8 @@ class GetIABooksActivity(activity.Activity):
                 toolbar.language_combo.connect('changed',
                 self.__language_changed_cb)
 
-        if len(self.catalogs) > 0:
-            self.bt_catalogs.show()
+        #if len(self.catalogs) > 0:
+        #    self.bt_catalogs.show()
 
         self._device_manager = devicemanager.DeviceManager()
         self._refresh_sources(toolbar)
@@ -621,8 +648,8 @@ class GetIABooksActivity(activity.Activity):
                 _('Enter words from the Author or Title to begin search.'))
 
         self._books_toolbar.search_entry.grab_focus()
-        if len(self.catalogs) > 0:
-            self.bt_catalogs.set_active(True)
+        #if len(self.catalogs) > 0:
+         #   self.bt_catalogs.set_active(True)
 
     def filter_catalogs_by_source(self):
         self.catalogs = {}
diff --git a/activity/activity.info b/activity/activity.info
index d8ca7bc..39fd56a 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -4,5 +4,5 @@ bundle_id = uy.ceibal.GetBooksCeibalActivity
 icon = get-ia-books
 exec = sugar-activity GetIABooksActivity.GetIABooksActivity
 show_launcher = yes
-activity_version = 5.4
+activity_version = 5.5
 license = GPLv2+