Port mesh and friends view to hippo, needs work
This commit is contained in:
Marco Pesenti Gritti
@@ -1,24 +1,25 @@
|
||||
import random
|
||||
|
||||
import goocanvas
|
||||
import hippo
|
||||
|
||||
from view.home.IconLayout import IconLayout
|
||||
from sugar.graphics.spreadlayout import SpreadLayout
|
||||
from view.home.MyIcon import MyIcon
|
||||
from view.BuddyActivityView import BuddyActivityView
|
||||
|
||||
class FriendsGroup(goocanvas.Group):
|
||||
class FriendsBox(hippo.CanvasBox, hippo.CanvasItem):
|
||||
__gtype_name__ = 'SugarFriendsBox'
|
||||
def __init__(self, shell, menu_shell):
|
||||
goocanvas.Group.__init__(self)
|
||||
hippo.CanvasBox.__init__(self, background_color=0xe2e2e2ff)
|
||||
|
||||
self._shell = shell
|
||||
self._menu_shell = menu_shell
|
||||
self._icon_layout = IconLayout(shell.get_grid())
|
||||
self._layout = SpreadLayout()
|
||||
self._friends = {}
|
||||
|
||||
me = MyIcon(112)
|
||||
me.translate(600 - (me.get_property('size') / 2),
|
||||
450 - (me.get_property('size') / 2))
|
||||
self.add_child(me)
|
||||
#me = MyIcon(112)
|
||||
#me.translate(600 - (me.get_property('size') / 2),
|
||||
# 450 - (me.get_property('size') / 2))
|
||||
#self.add_child(me)
|
||||
|
||||
friends = self._shell.get_model().get_friends()
|
||||
|
||||
@@ -30,8 +31,7 @@ class FriendsGroup(goocanvas.Group):
|
||||
|
||||
def add_friend(self, buddy_info):
|
||||
icon = BuddyActivityView(self._shell, self._menu_shell, buddy_info)
|
||||
self.add_child(icon)
|
||||
self._icon_layout.add_icon(icon)
|
||||
self.append(icon, hippo.PACK_FIXED)
|
||||
|
||||
self._friends[buddy_info.get_name()] = icon
|
||||
|
||||
@@ -39,5 +39,9 @@ class FriendsGroup(goocanvas.Group):
|
||||
self.add_friend(buddy_info)
|
||||
|
||||
def _friend_removed_cb(self, data_model, name):
|
||||
self.remove_child(self._friends[name])
|
||||
self.remove(self._friends[name])
|
||||
del self._friends[name]
|
||||
|
||||
def do_allocate(self, width, height):
|
||||
hippo.CanvasBox.do_allocate(self, width, height)
|
||||
self._layout.layout(self)
|
||||
@@ -1,12 +1,13 @@
|
||||
import gtk
|
||||
import goocanvas
|
||||
import hippo
|
||||
import cairo
|
||||
|
||||
from sugar.canvas.CanvasView import CanvasView
|
||||
from sugar.canvas.MenuShell import MenuShell
|
||||
from view.home.MeshGroup import MeshGroup
|
||||
from view.home.MeshBox import MeshBox
|
||||
from view.home.HomeGroup import HomeGroup
|
||||
from view.home.FriendsGroup import FriendsGroup
|
||||
from view.home.FriendsBox import FriendsBox
|
||||
import sugar
|
||||
|
||||
class HomeWindow(gtk.Window):
|
||||
@@ -27,8 +28,18 @@ class HomeWindow(gtk.Window):
|
||||
menu_shell = MenuShell(shell.get_grid())
|
||||
|
||||
self._add_page(HomeGroup(shell))
|
||||
self._add_page(FriendsGroup(shell, menu_shell))
|
||||
self._add_page(MeshGroup(shell, menu_shell))
|
||||
|
||||
canvas = hippo.Canvas()
|
||||
box = FriendsBox(shell, menu_shell)
|
||||
canvas.set_root(box)
|
||||
self._nb.append_page(canvas)
|
||||
canvas.show()
|
||||
|
||||
canvas = hippo.Canvas()
|
||||
box = MeshBox(shell, menu_shell)
|
||||
canvas.set_root(box)
|
||||
self._nb.append_page(canvas)
|
||||
canvas.show()
|
||||
|
||||
def _add_page(self, group):
|
||||
view = CanvasView()
|
||||
|
||||
@@ -1,91 +0,0 @@
|
||||
import random
|
||||
import math
|
||||
|
||||
import cairo
|
||||
|
||||
class IconLayout:
|
||||
DISTANCE_THRESHOLD = 120.0
|
||||
|
||||
def __init__(self, grid):
|
||||
self._icons = []
|
||||
self._constraints = {}
|
||||
self._grid = grid
|
||||
|
||||
[self._x1, self._y1] = self._grid.convert_to_canvas(1, 1)
|
||||
[self._x2, self._y2] = self._grid.convert_to_canvas(78, 59)
|
||||
|
||||
def add_icon(self, icon):
|
||||
self._icons.append(icon)
|
||||
self._layout_icon(icon)
|
||||
self.update()
|
||||
|
||||
def remove_icon(self, icon):
|
||||
self._icons.remove(icon)
|
||||
del self._constraints[icon]
|
||||
self.update()
|
||||
|
||||
def _get_distance(self, icon1, icon2):
|
||||
[icon1_x, icon1_y] = self._constraints[icon1]
|
||||
[icon2_x, icon2_y] = self._constraints[icon2]
|
||||
|
||||
a = icon1_x - icon2_x
|
||||
b = icon1_y - icon2_y
|
||||
|
||||
return math.sqrt(a * a + b * b)
|
||||
|
||||
def _get_repulsion(self, icon1, icon2):
|
||||
[icon1_x, icon1_y] = self._constraints[icon1]
|
||||
[icon2_x, icon2_y] = self._constraints[icon2]
|
||||
|
||||
f_x = icon1_x - icon2_x
|
||||
f_y = icon1_y - icon2_y
|
||||
|
||||
return [f_x, f_y]
|
||||
|
||||
def _spread_icons(self):
|
||||
self._stable = True
|
||||
|
||||
for icon1 in self._icons:
|
||||
vx = 0
|
||||
vy = 0
|
||||
|
||||
[x, y] = self._constraints[icon1]
|
||||
|
||||
for icon2 in self._icons:
|
||||
if icon1 != icon2:
|
||||
distance = self._get_distance(icon1, icon2)
|
||||
if distance <= IconLayout.DISTANCE_THRESHOLD:
|
||||
self._stable = False
|
||||
[f_x, f_y] = self._get_repulsion(icon1, icon2)
|
||||
vx += f_x
|
||||
vy += f_y
|
||||
|
||||
new_x = x + vx
|
||||
new_y = y + vy
|
||||
|
||||
new_x = max(self._x1, new_x)
|
||||
new_y = max(self._y1, new_y)
|
||||
|
||||
[width, height] = icon1.get_size_request()
|
||||
new_x = min(self._x2 - width, new_x)
|
||||
new_y = min(self._y2 - height, new_y)
|
||||
|
||||
self._constraints[icon1] = [new_x, new_y]
|
||||
|
||||
matrix = cairo.Matrix(1, 0, 0, 1, 0, 0)
|
||||
matrix.translate(new_x - (width / 2), new_y - (height / 2))
|
||||
icon1.set_transform(matrix)
|
||||
|
||||
def update(self):
|
||||
tries = 10
|
||||
self._spread_icons()
|
||||
while not self._stable and tries > 0:
|
||||
self._spread_icons()
|
||||
tries -= 1
|
||||
|
||||
def _layout_icon(self, icon):
|
||||
[width, height] = icon.get_size_request()
|
||||
x = random.random() * (self._x2 - self._x1 - width)
|
||||
y = random.random() * (self._y2 - self._y1 - height)
|
||||
|
||||
self._constraints[icon] = [x, y]
|
||||
@@ -1,26 +1,26 @@
|
||||
import random
|
||||
|
||||
import goocanvas
|
||||
import hippo
|
||||
|
||||
import conf
|
||||
from sugar.canvas.IconItem import IconItem
|
||||
from view.home.IconLayout import IconLayout
|
||||
from sugar.graphics.spreadlayout import SpreadLayout
|
||||
from sugar.graphics.canvasicon import CanvasIcon
|
||||
from view.BuddyIcon import BuddyIcon
|
||||
from sugar.canvas.SnowflakeLayout import SnowflakeLayout
|
||||
import conf
|
||||
|
||||
class ActivityView(goocanvas.Group):
|
||||
class ActivityView(hippo.CanvasBox):
|
||||
def __init__(self, shell, menu_shell, model):
|
||||
goocanvas.Group.__init__(self)
|
||||
hippo.CanvasBox.__init__(self)
|
||||
|
||||
self._shell = shell
|
||||
self._model = model
|
||||
self._layout = SnowflakeLayout()
|
||||
self._icons = {}
|
||||
|
||||
icon = IconItem(icon_name=model.get_icon_name(),
|
||||
color=model.get_color(), size=80)
|
||||
icon.connect('clicked', self._clicked_cb)
|
||||
self.add_child(icon)
|
||||
icon = CanvasIcon(icon_name=model.get_icon_name(),
|
||||
color=model.get_color(), size=80)
|
||||
icon.connect('activated', self._clicked_cb)
|
||||
self.append(icon, hippo.PACK_FIXED)
|
||||
self._layout.set_root(icon)
|
||||
|
||||
def has_buddy_icon(self, name):
|
||||
@@ -28,13 +28,11 @@ class ActivityView(goocanvas.Group):
|
||||
|
||||
def add_buddy_icon(self, name, icon):
|
||||
self._icons[name] = icon
|
||||
self.add_child(icon)
|
||||
self._layout.add_child(icon)
|
||||
self.append(icon, hippo.PACK_FIXED)
|
||||
|
||||
def remove_buddy_icon(self, name):
|
||||
icon = self._icons[name]
|
||||
self._layout.remove_child(icon)
|
||||
self.remove_child(icon)
|
||||
self.remove(icon)
|
||||
del self._icons[name]
|
||||
|
||||
def get_size_request(self):
|
||||
@@ -47,15 +45,15 @@ class ActivityView(goocanvas.Group):
|
||||
bundle = registry.get_activity_from_type(default_type)
|
||||
self._shell.join_activity(bundle.get_id(), self._model.get_id())
|
||||
|
||||
|
||||
class MeshGroup(goocanvas.Group):
|
||||
class MeshBox(hippo.CanvasBox, hippo.CanvasItem):
|
||||
__gtype_name__ = 'SugarMeshBox'
|
||||
def __init__(self, shell, menu_shell):
|
||||
goocanvas.Group.__init__(self)
|
||||
hippo.CanvasBox.__init__(self, background_color=0xe2e2e2ff)
|
||||
|
||||
self._shell = shell
|
||||
self._menu_shell = menu_shell
|
||||
self._model = shell.get_model().get_mesh()
|
||||
self._layout = IconLayout(shell.get_grid())
|
||||
self._layout = SpreadLayout()
|
||||
self._buddies = {}
|
||||
self._activities = {}
|
||||
self._buddy_to_activity = {}
|
||||
@@ -91,15 +89,13 @@ class MeshGroup(goocanvas.Group):
|
||||
def _add_alone_buddy(self, buddy_model):
|
||||
icon = BuddyIcon(self._shell, self._menu_shell, buddy_model)
|
||||
icon.props.size = 80
|
||||
self.add_child(icon)
|
||||
self.append(icon, hippo.PACK_FIXED)
|
||||
|
||||
self._buddies[buddy_model.get_name()] = icon
|
||||
self._layout.add_icon(icon)
|
||||
|
||||
def _remove_alone_buddy(self, buddy_model):
|
||||
icon = self._buddies[buddy_model.get_name()]
|
||||
self.remove_child(icon)
|
||||
self._layout.remove_icon(icon)
|
||||
self.remove(icon)
|
||||
del self._buddies[buddy_model.get_name()]
|
||||
|
||||
def _remove_buddy(self, buddy_model):
|
||||
@@ -110,7 +106,6 @@ class MeshGroup(goocanvas.Group):
|
||||
for activity in self._activities.values():
|
||||
if activity.has_buddy_icon(name):
|
||||
activity.remove_buddy_icon(name)
|
||||
self._layout.update()
|
||||
|
||||
def _move_buddy(self, buddy_model, activity_model):
|
||||
name = buddy_model.get_name()
|
||||
@@ -126,17 +121,17 @@ class MeshGroup(goocanvas.Group):
|
||||
icon.props.size = 60
|
||||
activity.add_buddy_icon(buddy_model.get_name(), icon)
|
||||
|
||||
self._layout.update()
|
||||
|
||||
def _add_activity(self, activity_model):
|
||||
icon = ActivityView(self._shell, self._menu_shell, activity_model)
|
||||
self.add_child(icon)
|
||||
self.append(icon, hippo.PACK_FIXED)
|
||||
|
||||
self._activities[activity_model.get_id()] = icon
|
||||
self._layout.add_icon(icon)
|
||||
|
||||
def _remove_activity(self, activity_model):
|
||||
icon = self._activities[activity_model.get_id()]
|
||||
self.remove_child(icon)
|
||||
self._layout.remove_icon(icon)
|
||||
self.remove(icon)
|
||||
del self._activities[activity_model.get_id()]
|
||||
|
||||
def do_allocate(self, width, height):
|
||||
hippo.CanvasBox.do_allocate(self, width, height)
|
||||
self._layout.layout(self)
|
||||
Reference in New Issue
Block a user