diff options
| -rw-r--r-- | GetIABooksActivity.py | 55 | ||||
| -rw-r--r-- | activity/activity.info | 2 |
2 files changed, 23 insertions, 34 deletions
diff --git a/GetIABooksActivity.py b/GetIABooksActivity.py index 4e47500..0195e58 100644 --- a/GetIABooksActivity.py +++ b/GetIABooksActivity.py @@ -74,7 +74,6 @@ class GetIABooksActivity(activity.Activity): "The entry point to the Activity" activity.Activity.__init__(self, handle, False) self.max_participants = 1 # no estamos compartiendo - self._pid = None self.selected_book = None self.queryresults = None self._getter = None @@ -118,12 +117,25 @@ class GetIABooksActivity(activity.Activity): self._books_toolbar = toolbar_box.toolbar - # Main layout. Layout inicial - self.hpane = Gtk.Paned.new(orientation=Gtk.Orientation.HORIZONTAL) - self.hpane.set_position(600) # setting initial position - - self._create_controls() + + self.menubox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) + + + self.mislibros = Gtk.Button(label="Mis Libros") + self.mislibros.connect("clicked", self.on_mislibros_clicked) + + self.menubox.pack_start(self.mislibros, True, True, 0) + + self.menubox.add(self.mislibros) + self.menubox.show() + #self.add(self.menubox) + + + def on_mislibros_clicked(self, widget): #control on mis libros + print "Mis libros" + + #self._create_controls() #importante para todos los controles de getbooks # suspend-resume @@ -260,7 +272,7 @@ class GetIABooksActivity(activity.Activity): toolbar.search_entry.set_size_request(width, -1) book_search_item.add(toolbar.search_entry) toolbar.search_entry.show() - toolbar.insert(book_search_item, -1) + toolbar.insert(book_search_item, -1) # se inserta en el toolbar book_search_item.show() toolbar.source_combo = ComboBox() # combo de fuentes de donde salen los libros. @@ -269,27 +281,9 @@ class GetIABooksActivity(activity.Activity): toolbar.source_combo.connect('changed', self.__source_changed_cb) combotool = ToolComboBox(toolbar.source_combo) combotool.set_size_request(width, -1) - toolbar.insert(combotool, -1) + toolbar.insert(combotool, -1) # se inserta en el toolbar combotool.show() - #toolbar.mislibros_toolbarbutton = ToolbarButton() # boton mis libros TODO aun sin implementar - #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')) @@ -434,12 +428,6 @@ class GetIABooksActivity(activity.Activity): # Callbacks - #def stop_button_cb(self, stop_button): - # try: - # if self._pid != None: os.kill(self._pid[1], SIGTERM) - # except: - # pass # process must already be dead. - def __format_changed_cb(self, combo): self.show_book_data(False) @@ -523,6 +511,7 @@ class GetIABooksActivity(activity.Activity): self.separa.hide() # visualizing downloads + def _create_controls(self): self._download_content_length = 0 self._download_content_type = None @@ -682,7 +671,7 @@ class GetIABooksActivity(activity.Activity): self.path_iter[p['text']] = self.treemodel.append([p['text']]) def can_close(self): - self._lang_code_handler.close() + #self._lang_code_handler.close() if self.queryresults is not None: self.queryresults.cancel() self.queryresults = None diff --git a/activity/activity.info b/activity/activity.info index 39fd56a..be35ed5 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.5 +activity_version = 5.6 license = GPLv2+ |