new expander areas & phrase of the week

1 files changed, 25 insertions, 9 deletions

diff --git a/calendario.py b/calendario.py
index d430e44..e056e62 100644
--- a/calendario.py
+++ b/calendario.py
@@ -86,7 +86,7 @@ class CalendarioActivity(activity.Activity):
         self._crear_columna()
 
         #ephemeris 
-
+        
         self.area_efem = gtk.ScrolledWindow()
         self.area_efem.set_shadow_type(gtk.SHADOW_IN)
         self.area_efem.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
@@ -106,6 +106,22 @@ class CalendarioActivity(activity.Activity):
         self.efemeride.set_editable(False)
         self.efemeride.set_cursor_visible(False)
         self.area_efem.add(self.efemeride)
+        self.expandir_efeme = gtk.Expander(_('Daily Ephemeris'))
+        self.expandir_efeme.add(self.area_efem)
+
+        #phrase of the week
+
+        self.area_frase = gtk.ScrolledWindow()
+        self.area_frase.set_shadow_type(gtk.SHADOW_IN)
+        self.area_frase.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+        self.buffer = gtk.TextBuffer()
+        self.frases = gtk.TextView(self.buffer)
+        self.frases.set_editable(False)
+        self.frases.set_cursor_visible(False)
+        self.area_frase.add(self.frases)
+        self.area_frase.set_size_request(-1, 80)
+        self.expandir_frases = gtk.Expander(_('Phrase of the week'))
+        self.expandir_frases.add(self.area_frase)
 
         #text input
         self.area_entrada = gtk.ScrolledWindow()
@@ -121,8 +137,11 @@ class CalendarioActivity(activity.Activity):
         self.boton3 = gtk.Button(_('Import'))
         
         #frames
-        self.marco_efemeride = gtk.Frame(_('Ephemeris'))
-        self.marco_efemeride.add(self.area_efem)
+        self.marco_expandible = gtk.Frame(_('Notes'))
+        self.marco_expandible_v = gtk.VBox()
+        self.marco_expandible_v.pack_start(self.expandir_frases, False)
+        self.marco_expandible_v.pack_start(self.expandir_efeme)
+        self.marco_expandible.add(self.marco_expandible_v)
         self.marco_actividades = gtk.Frame(_('Activities:'))
         self.marco_actividades.add(self.area_texto)
 
@@ -130,14 +149,13 @@ class CalendarioActivity(activity.Activity):
         self.combo = gtk.combo_box_new_text()
         self.combo.set_size_request(180, -1)
         self.combo.append_text(_('Mathematic'))
-        #self.combo.child.modify_text(gtk.STATE_NORMAL,gtk.gdk.color_parse("#DE0004")) 
         self.combo.append_text(_('Geography'))
         self.combo.append_text(_('Natural Science'))
         self.combo.append_text(_('Language'))
         self.combo.append_text(_('Without category'))
         self.combo.set_active(5) 
         
-        #expander
+        #expander options
         self.expandir = gtk.Expander(_('Expand for options'))
         self.check_status = 0
         self.check = gtk.CheckButton(_('Important'))
@@ -145,7 +163,7 @@ class CalendarioActivity(activity.Activity):
         self.expandir_h.pack_start(self.combo, False)
         self.expandir_h.pack_start(self.check)
         self.expandir.add(self.expandir_h)
-        
+                
         #file
         self.archivo = gtk.FileChooserWidget()
         self.archivo.set_current_folder('/media')
@@ -165,8 +183,6 @@ class CalendarioActivity(activity.Activity):
         self.calendario.connect('prev_month', self._ant_mes_cb)
         self.calendario.connect('next_year', self._sig_ano_cb)
         self.calendario.connect('prev_year', self._ant_ano_cb)
-        #self.color = gtk.gdk.Color(88,88,88)
-        #self.calendario.set_marked_date_color(02, self.color)
         self.boton1.connect('clicked', self._nuevo_ingreso_cb)
         self.boton2.connect('clicked', self._borrar_fila_cb)
         self.boton3.connect('clicked', self._importar_archivo_cb)
@@ -179,7 +195,7 @@ class CalendarioActivity(activity.Activity):
         #calendar
         self.contenedor_vi.pack_start(self.texto_fecha, False, padding = 5)
         self.contenedor_vi.pack_start(self.calendario, False, padding = 5)
-        self.contenedor_vi.pack_start(self.marco_efemeride, padding = 5)
+        self.contenedor_vi.pack_start(self.marco_expandible, padding = 5)
         
         self.contenedor_vd.pack_start(self.marco_actividades)
         self.contenedor_vd.pack_start(self.contenedor_extendido, False)