Merge branch 'master' of git.sugarlabs.org:calendario/mainline

3 files changed, 46 insertions, 44 deletions

diff --git a/archivo.py b/archivo.py
index 42a895a..b088ad4 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,8 @@ 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'])
     return modelo
 
 
@@ -134,7 +130,7 @@ def guardar_archivo(path, file_name, tipo_archivo):
         else:
             current_text = lines[i][4 : len(lines[i]) - 2]
         for j in range(30, len(current_text),30):
-            current_text = current_text[:j] + '\n' + current_text[j:]
+            current_text = current_text[:j] + '-\n' + current_text[j:]
         if tipo_archivo is 1:
             current_id = lines[i][0 : 8]
         else:
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)
diff --git a/po/Calendario.pot b/po/Calendario.pot
index 2c9e3ec..409d33f 100644
--- a/po/Calendario.pot
+++ b/po/Calendario.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 10:25-0600\n"
+"POT-Creation-Date: 2011-03-25 10:26-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,19 +18,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: activity/activity.info:2
-#: /home/yader/Documentos/calendario/mainline/calendario.py:34
+#: /home/yader/Documentos/calendario/mainline/calendario.py:35
 msgid "Calendario"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:39
+#: /home/yader/Documentos/calendario/mainline/calendario.py:40
 msgid "Import ephemeris"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:40
+#: /home/yader/Documentos/calendario/mainline/calendario.py:41
 msgid "Calendar"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:50
+#: /home/yader/Documentos/calendario/mainline/calendario.py:51
 msgid "Tools"
 msgstr ""
 
@@ -38,110 +38,114 @@ msgstr ""
 msgid "Today "
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:103
+#: /home/yader/Documentos/calendario/mainline/calendario.py:96
+msgid "Pending Tasks"
+msgstr ""
+
+#: /home/yader/Documentos/calendario/mainline/calendario.py:119
 msgid "There's not ephemeris"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:105
+#: /home/yader/Documentos/calendario/mainline/calendario.py:121
 msgid "There's not ephemeris imported"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:110
+#: /home/yader/Documentos/calendario/mainline/calendario.py:126
 msgid "Daily Ephemeris"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:127
+#: /home/yader/Documentos/calendario/mainline/calendario.py:142
 msgid "There's not phrases"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:129
+#: /home/yader/Documentos/calendario/mainline/calendario.py:144
 msgid "There's not phrases imported"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:135
+#: /home/yader/Documentos/calendario/mainline/calendario.py:150
 msgid "Phrase of the week"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:147
+#: /home/yader/Documentos/calendario/mainline/calendario.py:162
 msgid "Add new"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:148
+#: /home/yader/Documentos/calendario/mainline/calendario.py:163
 msgid "Remove"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:149
+#: /home/yader/Documentos/calendario/mainline/calendario.py:164
 msgid "Import"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:150
+#: /home/yader/Documentos/calendario/mainline/calendario.py:165
 msgid "Modify"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:153
+#: /home/yader/Documentos/calendario/mainline/calendario.py:168
 msgid "Notes"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:158
+#: /home/yader/Documentos/calendario/mainline/calendario.py:174
 msgid "Activities:"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:164
+#: /home/yader/Documentos/calendario/mainline/calendario.py:181
 msgid "Mathematic"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:165
+#: /home/yader/Documentos/calendario/mainline/calendario.py:182
 msgid "Geography"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:166
+#: /home/yader/Documentos/calendario/mainline/calendario.py:183
 msgid "Natural Science"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:167
+#: /home/yader/Documentos/calendario/mainline/calendario.py:184
 msgid "Language"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:168
+#: /home/yader/Documentos/calendario/mainline/calendario.py:185
 msgid "Without category"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:172
+#: /home/yader/Documentos/calendario/mainline/calendario.py:189
 msgid "Expand for options"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:174
+#: /home/yader/Documentos/calendario/mainline/calendario.py:191
 msgid "Important"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:176
+#: /home/yader/Documentos/calendario/mainline/calendario.py:193
 msgid "In Progress"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:178
+#: /home/yader/Documentos/calendario/mainline/calendario.py:195
 msgid "Completed"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:192
+#: /home/yader/Documentos/calendario/mainline/calendario.py:209
 msgid "Ephemeris"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:193
+#: /home/yader/Documentos/calendario/mainline/calendario.py:210
 msgid "Phrases"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:410
+#: /home/yader/Documentos/calendario/mainline/calendario.py:429
 msgid "Activity"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:411
+#: /home/yader/Documentos/calendario/mainline/calendario.py:430
 msgid "Category"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:412
+#: /home/yader/Documentos/calendario/mainline/calendario.py:431
 msgid "Priority"
 msgstr ""
 
-#: /home/yader/Documentos/calendario/mainline/calendario.py:413
+#: /home/yader/Documentos/calendario/mainline/calendario.py:432
 msgid "Status"
 msgstr ""