Starting redesignHEADmaster

3 files changed, 59 insertions, 71 deletions

diff --git a/.gitignore b/.gitignore
index f9a5800..e9636a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.pyc
 *.pyo
+*~
 dist/
 locale/
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):
diff --git a/agendacanvas.py b/agendacanvas.py
index 1d688da..00542ea 100755
--- a/agendacanvas.py
+++ b/agendacanvas.py
@@ -45,7 +45,9 @@ if __name__ == "__main__":
     a.set_property('gtk-theme-name', 'sugar-100')
 
 def pixbuf(path):
-    pix = gtk.gdk.pixbuf_new_from_file_at_size(path, 200, 200)
+    pix = gtk.gdk.pixbuf_new_from_file_at_size(path,
+                                   (gtk.gdk.screen_width() / 10) - 5,
+                                   (gtk.gdk.screen_width() / 10) - 5)
     return pix
 
 
@@ -93,45 +95,32 @@ class AddTelephoneArea(gtk.VBox):
             self.bb.props.palette.popdown(True)
 
 
-class canvas(gtk.HPaned):
+class Canvas(gtk.HPaned):
+
+    def __init__(self, remove):
+        super(Canvas, self).__init__()
 
-    def __init__(self):
-        super(canvas, self).__init__()
-        ####
-        self.toolbar = gtk.Toolbar()
-        self.remove = ToolButton('remove')
-        self.remove.set_tooltip(_('Remove this contact'))
-        self.addbtn = ToolButton('add')
-        self.addbtn.connect('clicked', self._show_palette_add_button)
-
-        self.sep = gtk.SeparatorToolItem()
-        self.toolarea = AddTelephoneArea(self.addbtn, self)
-        self.sep.props.draw = False
-        self.sep.set_expand(True)
-        self.toolbar.insert(self.sep, -1)
-        self.toolbar.insert(self.remove, -1)
-        ###
         self.ficha = Ficha()
-        self.set1 = Telefonos(self.remove, self.ficha)
+        fscroll = gtk.ScrolledWindow()
+        fscroll.add_with_viewport(self.ficha)
+        fscroll.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) 
+        self.set1 = Telefonos(remove, self.ficha)
         self.scroll = gtk.ScrolledWindow()
         self.scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
         self.scroll.add_with_viewport(self.set1)
         self.vbx = gtk.VBox()
         self.vbx.pack_start(self.scroll, True, True, 0)
-        self.vbx.pack_end(self.toolbar, False, True, 0)
         self.vbx.set_size_request(gtk.gdk.screen_width() / 3, -1)
 
         self.add1(self.vbx)
-        self.add2(self.ficha)
+        self.add2(fscroll)
         self.show_all()
-        self.addbtn.set_tooltip(_('Add a new contact'))
 
         if __name__ == "__main__":
                 self.toolbar.insert(self.addbtn, -1)
                 if os.path.isfile("users"):
                     self.read_file('users')
 
-        self._create_palette_add_button(self.addbtn)
 
     def read_file(self, file_path):
         fd = open(file_path, 'r')
@@ -145,21 +134,14 @@ class canvas(gtk.HPaned):
             email = data['emails'][current]
             direction = data['directions'][current]
             avatar = data['avatars'][current]
-            self._add(x, numero, edad, email, direction, avatar)
+            self.add(x, numero, edad, email, direction, avatar)
             current += 1
 
-    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)
-
     txt = _("Unknown")
     pt = os.path.join(os.getcwd(), 'avatars', 'none.svg')
     td = _("None")
 
-    def _add(self, name, number=txt, age=1, email=td, direct=txt, av=pt):
+    def add(self, name=_("New Contact"), number=txt, age=1, email=td, direct=txt, av=pt):
         self.set1._add_telephone(name, number, age, email, direct, av)
         self.show_all()
 
@@ -207,6 +189,7 @@ class Telefonos(gtk.TreeView):
                     echo = True
             a += 1
         self.ficha.name_entry.set_text(name)
+        self.ficha.name_entry.grab_focus()
         self.ficha.age_entry.set_text(str(AGES[utils.current]))
         self.ficha.telephone_entry.set_text(str(NUMBERS[utils.current]))
         self.ficha.email_entry.set_text(str(EMAILS[utils.current]))
@@ -234,6 +217,7 @@ class Telefonos(gtk.TreeView):
         AVATARS.append(avatar)
         IMAGE.set_from_pixbuf(pixbuf(avatar))
         IMAGE.show_all()
+        self.set_cursor(len(NAMES) - 1)
 
         self.show_all()
 
@@ -282,13 +266,11 @@ class Ficha(gtk.VBox):
         Direction -Entry-
         """
         ###
-        self.namee = gtk.Label(_('Name:'))
         self.age = gtk.Label(_('Age:'))
         self.telephone = gtk.Label(_('Telephone:'))
         self.email = gtk.Label('Email:')
         self.direction = gtk.Label(_('Adress:'))
 
-        self.namee.set_size_request(100, -1)
         self.age.set_size_request(100, -1)
         self.telephone.set_size_request(100, -1)
         self.email.set_size_request(100, -1)
@@ -298,7 +280,8 @@ class Ficha(gtk.VBox):
         self.name_entry = gtk.Entry()
         self.user = gtk.Button()
         self.conectado = self.user.connect('clicked', self.open)
-        IMAGE.set_size_request(200, 200)
+        #self.user.set_size_request((gtk.gdk.screen_width() / 10) - 5,
+        #                           (gtk.gdk.screen_width() / 10) - 5)
         self.user.add(IMAGE)
         self.age_entry = gtk.SpinButton()
 
@@ -327,8 +310,7 @@ class Ficha(gtk.VBox):
         self.emailbox = gtk.HBox()
         self.directionbox = gtk.HBox()
         ###
-        self.namebox.pack_start(self.user, expand=True, fill=True, padding=6)
-        self.namebox.pack_start(self.namee, False, False, 6)
+        self.namebox.pack_start(self.user, False, True, padding=6)
         self.namebox.pack_end(self.name_entry, True, True, 6)
         self.agebox.pack_start(self.age, False, False, 6)
         self.agebox.pack_end(self.age_entry, True, True, 6)
@@ -391,7 +373,9 @@ class Ficha(gtk.VBox):
             self.user.disconnect(self.conectado)
             path = ch.file_path
             self.conectado = self.user.connect('clicked', self.open, path)
-            pix = gtk.gdk.pixbuf_new_from_file_at_size(path, 200, 200)
+            pix = gtk.gdk.pixbuf_new_from_file_at_size(path, 
+                                   (gtk.gdk.screen_width() / 10) - 5,
+                                   (gtk.gdk.screen_width() / 10) - 5)
             image.set_from_pixbuf(pix)
             for x in list(self.user):
                 self.user.remove(x)
@@ -412,7 +396,9 @@ class Ficha(gtk.VBox):
     def _set_img_button(self, widget, path, win):
         win.destroy()
         image = gtk.Image()
-        pix = gtk.gdk.pixbuf_new_from_file_at_size(path, 200, 200)
+        pix = gtk.gdk.pixbuf_new_from_file_at_size(path, 
+                                   (gtk.gdk.screen_width() / 10) - 5,
+                                   (gtk.gdk.screen_width() / 10) - 5)
         image.set_from_pixbuf(pix)
         self.user.disconnect(self.conectado)
         self.conectado = self.user.connect('clicked', self.open, path)
@@ -516,7 +502,8 @@ class Avatars(gtk.VBox):
         button.set_sensitive(sensi)
         button.set_tooltip_text(path)
         image = gtk.Image()
-        pix = gtk.gdk.pixbuf_new_from_file_at_size(path, 100, 100)
+        pix = gtk.gdk.pixbuf_new_from_file_at_size(path,                                    							   (gtk.gdk.screen_width() / 10) - 5,
+                                                   (gtk.gdk.screen_width() / 10) - 5)
         image.set_from_pixbuf(pix)
         button.add(image)
         button.connect('clicked', self._set_path)