From f90c56e934812e59834b23263c485f6bc825daa2 Mon Sep 17 00:00:00 2001
From: Agustin Zubiaga <aguz@sugarlabs.org>
Date: Tue, 11 Jun 2013 21:19:56 +0000
Subject: Starting redesign

---
(limited to 'agenda.py')

diff --git a/agenda.py b/agenda.py
index 63e2416..618a308 100755
--- a/agenda.py
+++ b/agenda.py
@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 # Ignacio Rodríguez <nachoel01@gmail.com>
 # Rafael Cordano <rafael.cordano@gmail.com>
+# Agustin Zubiaga <aguz@sugarlabs.org>
 # CeibalJAM! - Uruguay 2013
 
-
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
@@ -26,7 +26,7 @@ from sugar.activity.widgets import ActivityToolbarButton
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.toolbarbox import ToolbarBox
 from gettext import gettext as _
-from agendacanvas import canvas
+from agendacanvas import Canvas
 import agendacanvas
 import simplejson
 import os
@@ -38,50 +38,50 @@ class Agenda(activity.Activity):
 
     def __init__(self, handle):
         super(Agenda, self).__init__(handle, True)
+        
         tool = ToolbarBox()
         toolbar = tool.toolbar
+
         activitybtn = ActivityToolbarButton(self)
-        self.separator = gtk.SeparatorToolItem()
-        self.separator.props.draw = False
-        self.separator.set_expand(True)
-        stpbtn = StopButton(self)
-        self.addbtn = ToolButton('add')
-        self.addbtn.connect('clicked', self._show_palette_add_button)
         toolbar.insert(activitybtn, 0)
         toolbar.insert(gtk.SeparatorToolItem(), -1)
-        toolbar.insert(self.addbtn, -1)
-        toolbar.insert(self.separator, -1)
+
+        addbtn = ToolButton('add')
+        addbtn.set_tooltip(_('New contact'))
+        toolbar.insert(addbtn, -1)
+
+        remove = ToolButton('remove')
+        remove.set_tooltip(_('Remove this contact'))
+        toolbar.insert(remove, -1)
+
+        separator = gtk.SeparatorToolItem()
+        separator.props.draw = False
+        separator.set_expand(True)
+        toolbar.insert(separator, -1)
+
+        stpbtn = StopButton(self)
         toolbar.insert(stpbtn, -1)
 
-        self.canvas = canvas()
-        self.toolarea = AddTelephoneArea(self.addbtn, self.canvas)
+        self._canvas = Canvas(remove)
+        addbtn.connect('clicked', lambda w: self._canvas.add())    
 
         self.set_toolbar_box(tool)
-        self.set_canvas(self.canvas)
-        self.addbtn.set_tooltip(_('Add a new contact'))
-        self._create_palette_add_button(self.addbtn)
+        self.set_canvas(self._canvas)
         self.show_all()
 
-    def _show_palette_add_button(self, button):
-        button.props.palette.popup(immediate=True, state=1)
-
-    def _create_palette_add_button(self, button):
-        pallete = button.get_palette()
-        pallete.set_content(self.toolarea)
-
     def read_file(self, file_path):
         fd = open(file_path, 'r')
         text = fd.read()
         data = simplejson.loads(text)
         fd.close()
-	c = 0
-	for x in data['avatars']:
-		if os.path.exists(x):
-			pass
-		else:
-			data['avatars'].__setitem__(c, os.path.join(os.getcwd(),
-				'avatars','none.svg'))
-		c += 1
+        c = 0
+        for x in data['avatars']:
+	        if os.path.exists(x):
+		        pass
+	        else:
+		        data['avatars'].__setitem__(c, os.path.join(os.getcwd(),
+			        'avatars','none.svg'))
+        c += 1
         current = 0
         for x in data['names']:
             numero = data['telephones'][current]
@@ -89,7 +89,7 @@ class Agenda(activity.Activity):
             email = data['emails'][current]
             direction = data['directions'][current]
             avatar = data['avatars'][current]
-            self.canvas._add(x, numero, edad, email, direction, avatar)
+            self._canvas._add(x, numero, edad, email, direction, avatar)
             current += 1
 
     def write_file(self, file_path):
--
cgit v0.9.1