From c710298f44ba0e219a33c2e1e588a0bd0f8fd7e2 Mon Sep 17 00:00:00 2001 From: Yader Velásquez Date: Sun, 14 Nov 2010 10:17:50 +0000 Subject: second version --- (limited to 'calendario.py') diff --git a/calendario.py b/calendario.py index ae8a14c..32271d9 100644 --- a/calendario.py +++ b/calendario.py @@ -19,7 +19,7 @@ from gettext import gettext as _ from fecha import FechaUnix, FechaNormal from archivo import crear_modelo, abrir_efemeride, guardar_dato, borrar_dato import gtk -#import logging +import logging from sugar.activity import activity @@ -35,7 +35,7 @@ class CalendarioActivity(activity.Activity): self.set_toolbox(barra_herramientas) barra_herramientas.show() self.fecha_normal = FechaNormal() - #self._log = logging.getLogger('log principal') + self._log = logging.getLogger('log principal') self.path = self.get_activity_root() @@ -50,7 +50,7 @@ class CalendarioActivity(activity.Activity): #daily activities self.area_texto = gtk.ScrolledWindow() self.area_texto.set_shadow_type(gtk.SHADOW_IN) - self.area_texto.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) + self.area_texto.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) self.lista_fecha_t = self.calendario.get_date() @@ -95,23 +95,47 @@ class CalendarioActivity(activity.Activity): self.boton2 = gtk.Button(_('Borrar')) #frames - self.marco_efemeride = gtk.Frame(_('La efemeride del día de hoy es:')) + self.marco_efemeride = gtk.Frame(_('Efemerides:')) self.marco_efemeride.add(self.area_efem) - self.marco_actividades = gtk.Frame(_('Tus actividades para hoy son:')) + self.marco_actividades = gtk.Frame(_('Actividades:')) self.marco_actividades.add(self.area_texto) + #combobox + self.combo = gtk.combo_box_new_text() + self.combo.set_size_request(180, -1) + self.combo.append_text(_('Matemática')) + self.combo.append_text(_('Geografía')) + self.combo.append_text(_('Ciencias')) + self.combo.append_text(_('Español')) + self.combo.append_text(_('Examen')) + self.combo.append_text(_('Sin categoria')) + self.combo.set_active(5) + + #expander + #self.categoria = gtk.Label(_("Categoria")) + self.expandir = gtk.Expander(_('Expandir para mas opciones')) + self.check_status = 0 + self.check = gtk.CheckButton(_('Marcar como importante')) + self.expandir_h = gtk.HBox() + self.expandir_h.pack_start(self.combo, False) + self.expandir_h.pack_start(self.check) + self.expandir.add(self.expandir_h) + + #containers self.contenedor_h = gtk.HBox() self.contenedor_vd = gtk.VBox() self.contenedor_vi = gtk.VBox() self.sub_contenedor_h = gtk.HBox() + self.contenedor_extendido = gtk.HBox() self.botones_contenedor = gtk.VBox() - + #callbacks self.calendario.connect('day_selected', self._dia_selec_cb) self.boton1.connect('clicked', self._nuevo_ingreso_cb) self.boton2.connect('clicked', self._borrar_fila_cb) - + self.check.connect('toggled', self._check_cb) + ########################### Add Blocks ################################ self.contenedor_h.pack_start(self.contenedor_vi, False, padding = 5) @@ -120,18 +144,27 @@ class CalendarioActivity(activity.Activity): self.contenedor_vi.pack_start(self.marco_efemeride, padding = 5) self.contenedor_h.pack_start(self.contenedor_vd, padding = 5) - + self.contenedor_vd.pack_start(self.marco_actividades) - self.contenedor_vd.pack_start(self.sub_contenedor_h, False, padding = 15) + self.contenedor_vd.pack_start(self.contenedor_extendido, False) + self.contenedor_extendido.pack_start(self.expandir) + self.contenedor_vd.pack_start(self.sub_contenedor_h, False, padding = 5) self.sub_contenedor_h.pack_start(self.area_entrada) - self.sub_contenedor_h.pack_start(self.botones_contenedor, False) + self.sub_contenedor_h.pack_start(self.botones_contenedor, False, padding = 3) self.botones_contenedor.pack_start(self.boton1) self.botones_contenedor.pack_start(self.boton2) self.set_canvas(self.contenedor_h) self.contenedor_h.show_all() + def _check_cb(self, widget, data=None): + if self.check_status is 1: + self.check_status = 0 + else: + self.check_status = 1 + self._log.debug(self.check_status) + def _dia_selec_cb(self, widget, data=None): '''when a date is selected''' self.lista_fecha = self.calendario.get_date() @@ -162,7 +195,11 @@ class CalendarioActivity(activity.Activity): self.buffer = self.entrada.get_buffer() self.inicio, self.final = self.buffer.get_bounds() self.cadena = self.buffer.get_text(self.inicio, self.final, False) - guardar_dato(self.indice_dia, self.cadena, self.path) + self.modelocombo = self.combo.get_model() + self.index = self.combo.get_active() + self.categoria = self.modelocombo[self.index][0] + guardar_dato(self.indice_dia, self.cadena, self.categoria,\ + self.check_status, self.path) self.buffer.set_text(' ') self.modelo = crear_modelo(self.indice_dia, self.path) self.actividades.set_model(self.modelo) @@ -172,15 +209,20 @@ class CalendarioActivity(activity.Activity): def _crear_columna(self): '''create the columns for the treeview''' self.celda = gtk.CellRendererText() - self.numero = (_('Numero de actividad')) - self.actividad = (_('Actividades para hoy')) + self.numero = ('#') + self.actividad = (_('Actividad')) + self.categoria = (_('Categoria')) + self.prioridad = (_('Prioridad')) self.columna = gtk.TreeViewColumn(self.numero, self.celda, text = 0) self.actividades.append_column(self.columna) - self.columna = gtk.TreeViewColumn(self.actividad, self.celda, text = 1) self.actividades.append_column(self.columna) - + self.columna = gtk.TreeViewColumn(self.categoria, self.celda, text = 2) + self.actividades.append_column(self.columna) + self.columna = gtk.TreeViewColumn(self.prioridad, self.celda, text = 3) + self.actividades.append_column(self.columna) + def close(self, skip_save=False): '''Override the close method so we don't try to create a Journal entry''' -- cgit v0.9.1