Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryaderv <yajosev@gmail.com>2011-03-25 16:30:26 (GMT)
committer yaderv <yajosev@gmail.com>2011-03-25 16:30:26 (GMT)
commit9fa3449c826b7a7615aa6dff263ba8d283462dca (patch)
treeb8c653945d592fb7f2f21444f03a4643ae127d9e
parentab6395ef9ee53ea6190e7da2e8a8e4a9ce697151 (diff)
pending task bug fixed
-rw-r--r--archivo.py14
-rw-r--r--calendario.py8
2 files changed, 11 insertions, 11 deletions
diff --git a/archivo.py b/archivo.py
index 42a895a..387a29a 100644
--- a/archivo.py
+++ b/archivo.py
@@ -75,7 +75,8 @@ def crear_modelo(indice, path):
def tareas_pendientes(path):
'''Save/Update a file with the pending task,
activities marked as in progress'''
- modelo = gtk.ListStore(gobject.TYPE_STRING)
+ progreso = gtk.STOCK_YES
+ modelo = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
lista_temporal = list()
path_actividades = path + '/data/actividades.pkl'
path_tareas = path
@@ -85,13 +86,10 @@ def tareas_pendientes(path):
_log.debug(dia)
for fechas_datos in dia:
for datos in dia[fechas_datos]:
- if datos[3] is not None:
- _log.debug(datos)
- #modelo.append(datos[0])
- else:
- modelo.append('')
- else:
- modelo.append('')
+ if progreso in datos:
+ modelo.append([datos[0], '#FFFFFF'])
+ #else:
+ #modelo.append([''])
return modelo
diff --git a/calendario.py b/calendario.py
index f945328..fea4158 100644
--- a/calendario.py
+++ b/calendario.py
@@ -87,7 +87,7 @@ class CalendarioActivity(activity.Activity):
#pending tasks
self.area_tarea = gtk.ScrolledWindow()
#self.area_tarea.set_shadow_type(ALGO)
- self.area_tarea.set_sensitive(False)
+ #self.area_tarea.set_sensitive(False)
self.area_tarea.set_size_request(-1, 100)
self.area_tarea.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
self.pendientes = gtk.TreeView(tareas_pendientes(self.path))
@@ -380,7 +380,8 @@ class CalendarioActivity(activity.Activity):
self.calendario.unmark_day(borrar_dia)
self.modelo = crear_modelo(self.indice, self.path)
- self.actividades.set_model(self.modelo)
+ self.actividades.set_model(self.modelo)
+ self.pendientes.set_model(tareas_pendientes(self.path))
def _nuevo_ingreso_cb(self, widget, data=None):
'''when the user clicked on the save button,
@@ -442,7 +443,7 @@ class CalendarioActivity(activity.Activity):
self.columna = gtk.TreeViewColumn(self.estado, self.icono, stock_id = 4, cell_background = 5)
self.actividades.append_column(self.columna)
#for pending task
- self.columna = gtk.TreeViewColumn(self.actividad, self.celda, text = 0)
+ self.columna = gtk.TreeViewColumn(self.actividad, self.celda, text = 0, cell_background = 1)
self.pendientes.append_column(self.columna)
def guardar(self):
@@ -473,6 +474,7 @@ class CalendarioActivity(activity.Activity):
self.buffer.set_text(' ')
self.modelo = crear_modelo(self.indice, self.path)
self.actividades.set_model(self.modelo)
+ self.pendientes.set_model(tareas_pendientes(self.path))
self.marcar_calendario(self.marcar_dia) #mark the day in the calendar
self.desactivar_boton() #make inactive again the checkbutton
self.combo.set_active(-1)