diff options
| -rw-r--r-- | archivo.py | 31 | ||||
| -rw-r--r-- | calendario.py | 21 |
2 files changed, 28 insertions, 24 deletions
@@ -21,7 +21,14 @@ import gobject import os import logging from gettext import gettext as _ -_log = logging.getLogger('Log archivo') +_log = logging.getLogger('Log Archivo') + +#def color_categoria(entero): +# if entero >= 0: +# color = ['#222222', '#333333', '#444444', '#555555', '#666666'] +# return color[entero] +# else: +# return None def separar_cadena(texto): nuevo_texto = '' @@ -43,7 +50,7 @@ def crear_modelo(indice, path): '''create the liststore model for the main block''' path = path + '/data/actividades.pkl' modelo = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING,\ - gobject.TYPE_STRING) + gobject.TYPE_STRING, gobject.TYPE_STRING) if not os.path.exists(path): _log.debug('THE FILE ACTIVIDADES DID NOT EXISTS') @@ -53,7 +60,6 @@ def crear_modelo(indice, path): modelo.append(['', '', '', None]) else: - #_log.debug('THE FILE EXISTS') archivo = open(path, 'rb') dia = pickle.load(archivo) contar_int = 1 @@ -62,12 +68,12 @@ def crear_modelo(indice, path): if len(dia[indice]): for activ in dia[indice]: contar = str(contar_int) - modelo.append([contar, activ[0], activ[1], activ[2]]) + modelo.append([contar, activ[0], activ[1], activ[2], activ[3]]) contar_int += 1 else: - modelo.append(['', '', '', None]) + modelo.append(['', '', '', None, None]) else : - modelo.append(['', '', '', None]) + modelo.append(['', '', '', None, None]) archivo.close() return modelo @@ -84,7 +90,6 @@ def comprobar_efemeride(path): def abrir_efemeride(path): '''open the ephemeris file and return a data dictionary''' path = path + '/data/efemerides.pkl' - _log.debug('THE FILE EPHEMERIS EXISTS') archivo = open(path, 'rb') texto = pickle.load(archivo) archivo.close() @@ -108,8 +113,11 @@ def guardar_efemeride(path, file_name): file_new.close() archivo.close() -def guardar_dato(indice, contenido, categoria, bolean, path): +def guardar_dato(indice, contenido, categoria, entero_cat, bolean, path): '''save the content in a file, add the content to a dictionary->list''' + _log.debug(entero_cat) + color_categoria = ['#222222', '#333333', '#444444', '#555555', '#666666'] + path = path + '/data/actividades.pkl' indice = str(indice) f = open(path, 'rb+wb') @@ -123,7 +131,12 @@ def guardar_dato(indice, contenido, categoria, bolean, path): dia[indice] = [] if len(contenido) > 40: contenido = separar_cadena(contenido) - dia[indice].append([contenido, categoria, prioridad]) + if entero_cat > -1: + color = color_categoria[entero_cat] + else: + color = None + + dia[indice].append([contenido, categoria, prioridad, color]) f.seek(0) pickle.dump(dia, f) f.close() diff --git a/calendario.py b/calendario.py index baa6eab..94e15d9 100644 --- a/calendario.py +++ b/calendario.py @@ -51,7 +51,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 Calendario') self.path = self.get_activity_root() ######################### set interface ######################## @@ -240,12 +240,10 @@ class CalendarioActivity(activity.Activity): #mark next month self._log.debug(self.marcar_dia[2:4]) if "01" in self.marcar_dia[2:4]: - self._log.debug("entro en el if") self.marcar_dia = int(self.marcar_dia) - 8900 else: self.marcar_dia = int(self.marcar_dia) - 100 self.marcar_dia = str(self.marcar_dia) - self._log.debug(self.marcar_dia) self.lista_dias_marcados = dict_meses(self.path, self.marcar_dia) indice = self.marcar_dia[:4] for dia in self.lista_dias_marcados[indice]: @@ -261,7 +259,6 @@ class CalendarioActivity(activity.Activity): self.marcar_dia = int(self.marcar_dia) + 10000 self.marcar_dia = str(self.marcar_dia) - self._log.debug(self.marcar_dia) self.lista_dias_marcados = dict_meses(self.path, self.marcar_dia) indice = self.marcar_dia[:4] for dia in self.lista_dias_marcados[indice]: @@ -279,7 +276,6 @@ class CalendarioActivity(activity.Activity): self.marcar_dia = int(self.marcar_dia) - 10000 self.marcar_dia = str(self.marcar_dia) - self._log.debug(self.marcar_dia) self.lista_dias_marcados = dict_meses(self.path, self.marcar_dia) indice = self.marcar_dia[:4] for dia in self.lista_dias_marcados[indice]: @@ -320,18 +316,14 @@ class CalendarioActivity(activity.Activity): self.modelocombo = self.combo.get_model() self.index = self.combo.get_active() self.categoria = self.modelocombo[self.index][0] - guardar_dato(self.indice, self.cadena, self.categoria, self.check_status, self.path) + guardar_dato(self.indice, self.cadena, self.categoria, self.index, self.check_status, self.path) self.buffer.set_text(' ') self.modelo = crear_modelo(self.indice, self.path) self.actividades.set_model(self.modelo) self.marcar_calendario(self.marcar_dia) #mark the day in the calendar - self._log.debug(self.marcar_dia) if self.check_status is 1: #make inactive again the checkbutton self.check.set_active(False) - self.prueba = self.modelo.get_iter(0) - - def _importar_cb(self, widget, data=None): '''change to the import view''' self.set_canvas(self.archivo) @@ -354,14 +346,14 @@ class CalendarioActivity(activity.Activity): self.categoria = (_('Category')) self.prioridad = (_('Priority')) - self.columna = gtk.TreeViewColumn('', self.celda, text = 0) + self.columna = gtk.TreeViewColumn('', self.celda, text = 0, cell_background = 4) self.actividades.append_column(self.columna) - self.columna = gtk.TreeViewColumn(self.actividad, self.celda, text = 1) + self.columna = gtk.TreeViewColumn(self.actividad, self.celda, text = 1, cell_background = 4) self.columna.set_min_width(365) self.actividades.append_column(self.columna) - self.columna = gtk.TreeViewColumn(self.categoria, self.celda, text = 2) + self.columna = gtk.TreeViewColumn(self.categoria, self.celda, text = 2, cell_background = 4) self.actividades.append_column(self.columna) - self.columna = gtk.TreeViewColumn(self.prioridad, self.icono, stock_id = 3) + self.columna = gtk.TreeViewColumn(self.prioridad, self.icono, stock_id = 3, cell_background = 4) self.actividades.append_column(self.columna) def marcar_calendario(self, fecha=None): @@ -372,7 +364,6 @@ class CalendarioActivity(activity.Activity): indice = fecha[:4] for dia in self.lista_dias_marcados[indice]: self.calendario.mark_day(dia) - self._log.debug(dia) def close(self, skip_save=False): '''Override the close method so we don't try to |