diff options
author | yaderv <yajosev@gmail.com> | 2011-02-24 15:35:17 (GMT) |
---|---|---|
committer | yaderv <yajosev@gmail.com> | 2011-02-24 15:35:17 (GMT) |
commit | f18321dbc8cd55d8fc6568d787a07c22d201d003 (patch) | |
tree | 349e3b0e20b16a69da916fa9f021e3bfdf3c2d07 /calendario.py | |
parent | 8f59d01cb7718c9305a9fd747ff7993ef3918d1b (diff) |
code improved
Diffstat (limited to 'calendario.py')
-rw-r--r-- | calendario.py | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/calendario.py b/calendario.py index ef66ef1..3e5f3b1 100644 --- a/calendario.py +++ b/calendario.py @@ -52,10 +52,6 @@ class CalendarioActivity(activity.Activity): self.fecha_normal = FechaNormal() self._log = logging.getLogger('log principal') self.path = self.get_activity_root() - self.lista_dias_marcados = dict_meses(self.path) #give the dictionary with the data index - self._log.debug(type(self.lista_dias_marcados)) - - ######################### set interface ######################## @@ -63,15 +59,14 @@ class CalendarioActivity(activity.Activity): self.calendario = gtk.Calendar() self.fecha = _('Today ') + self.fecha_normal.fecha_actual() self.texto_fecha = gtk.Label(self.fecha) - - #mark the calendar - self.lista_fecha = self.calendario.get_date() - self.indice_dia = FechaUnix(self.lista_fecha) - self.indice = self.indice_dia.fecha_unix() - self.marcar_dia = self.indice_dia.indice_unix(self.indice) - self.lista_dias_marcados = dict_meses(self.path, self.marcar_dia) + self.lista_fecha = self.calendario.get_date() + #mark the calendar + self.indice_dia = FechaUnix(self.lista_fecha) + self.indice = self.indice_dia.fecha_unix() + self.marcar_dia = self.indice_dia.indice_unix(self.indice) + self.lista_dias_marcados = dict_meses(self.path, self.marcar_dia) indice = self.marcar_dia[:4] - for dia in self.lista_dias_marcados[indice]: + for dia in self.lista_dias_marcados[indice]: self.calendario.mark_day(dia) #daily activities @@ -164,6 +159,7 @@ class CalendarioActivity(activity.Activity): #callbacks self.calendario.connect('day_selected', self._dia_selec_cb) + self.calendario.connect('next_month', self._sig_mes_cb) self.boton1.connect('clicked', self._nuevo_ingreso_cb) self.boton2.connect('clicked', self._borrar_fila_cb) self.boton3.connect('clicked', self._importar_archivo_cb) @@ -207,7 +203,11 @@ class CalendarioActivity(activity.Activity): self.indice_dia = FechaUnix(self.lista_fecha) self.modelo = crear_modelo(self.indice_dia.fecha_unix(), self.path) self.actividades.set_model(self.modelo) - + + def _sig_mes_cb(self, widget, data=None): + '''when the calendar is changed to the next month''' + pass + def _borrar_fila_cb(self, widget, data=None): '''deleted the selected row''' self.seleccion = self.actividades.get_selection() @@ -225,8 +225,6 @@ class CalendarioActivity(activity.Activity): self.modelo = crear_modelo(self.indice, self.path) self.actividades.set_model(self.modelo) - - def _nuevo_ingreso_cb(self, widget, data=None): '''when the user clicked on the save button, @@ -290,7 +288,8 @@ class CalendarioActivity(activity.Activity): def marcar_calendario(self, fecha=None): '''mark the days that have activities stored''' self._log.debug(fecha) - self.lista_dias_marcados = dict_meses(self.path, fecha) + guardar = 1 + self.lista_dias_marcados = dict_meses(self.path, fecha, guardar) indice = fecha[:4] for dia in self.lista_dias_marcados[indice]: self.calendario.mark_day(dia) |