Merge branch 'master' of git://dev.laptop.org/sugar
This commit is contained in:
Eduardo Silva
commit
6a685d38b4
@ -306,7 +306,7 @@ class PresenceService(DBusGObject):
|
||||
if not self._owner:
|
||||
raise NotFoundError("The owner was not found.")
|
||||
else:
|
||||
return self._owner.get_object_path()
|
||||
return self._owner.object_path()
|
||||
|
||||
@dbus.service.method(_PRESENCE_INTERFACE, in_signature="sssa{sv}",
|
||||
out_signature="o", async_callbacks=('async_cb', 'async_err_cb'))
|
||||
|
||||
@ -185,6 +185,7 @@ class EntryBox(hippo.CanvasBox, hippo.CanvasItem):
|
||||
self.append(self._label)
|
||||
|
||||
self._entry = gtk.Entry()
|
||||
self._entry.set_max_length(45)
|
||||
entry_item = hippo.CanvasWidget(widget=self._entry)
|
||||
self.append(entry_item)
|
||||
|
||||
@ -297,7 +298,8 @@ class IntroWindow(gtk.Window):
|
||||
section = 'Buddy'
|
||||
if not cp.has_section(section):
|
||||
cp.add_section(section)
|
||||
cp.set(section, 'NickName', name)
|
||||
# encode nickname to ascii-safe characters
|
||||
cp.set(section, 'NickName', name.encode("utf-8"))
|
||||
cp.set(section, 'Color', color.to_string())
|
||||
|
||||
section = 'Server'
|
||||
|
||||
@ -29,6 +29,8 @@ pygtk.require('2.0')
|
||||
import gtk
|
||||
import gobject
|
||||
|
||||
from sugar import env
|
||||
|
||||
def _get_display_number():
|
||||
"""Find a free display number trying to connect to 6000+ ports"""
|
||||
log.info( "Attempting to find free port for X11 (Xephyr)" )
|
||||
@ -104,6 +106,9 @@ def _setup_env():
|
||||
os.environ['PYTHONPATH'] = source_dir + ':' + path
|
||||
log.info( 'Set PYTHONPATH=%s', os.environ['PYTHONPATH'] )
|
||||
|
||||
os.environ['GABBLE_LOGFILE'] = os.path.join(env.get_profile_path(), 'logs', 'telepathy-gabble.log')
|
||||
os.environ['STREAM_ENGINE_LOGFILE'] = os.path.join(env.get_profile_path(), 'logs', 'telepathy-stream-engine.log')
|
||||
|
||||
def main():
|
||||
"""Script-level operations"""
|
||||
logging.basicConfig()
|
||||
|
||||
@ -15,67 +15,137 @@
|
||||
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
# Boston, MA 02111-1307, USA.
|
||||
|
||||
import random
|
||||
from array import array
|
||||
from random import random
|
||||
|
||||
import hippo
|
||||
import gtk
|
||||
|
||||
from sugar.graphics import units
|
||||
_X_TILES = 120
|
||||
_NUM_TRIALS = 20
|
||||
_MAX_WEIGHT = 255
|
||||
|
||||
_WIDTH = gtk.gdk.screen_width()
|
||||
_HEIGHT = gtk.gdk.screen_height()
|
||||
_CELL_WIDTH = units.grid_to_pixels(1)
|
||||
_CELL_HEIGHT = units.grid_to_pixels(1)
|
||||
_GRID_WIDTH = _WIDTH / _CELL_WIDTH
|
||||
_GRID_HEIGHT = _HEIGHT / _CELL_HEIGHT
|
||||
class _Grid(object):
|
||||
def __init__(self, x_tiles, y_tiles, cell_size):
|
||||
self._array = array('B')
|
||||
self.x_tiles = x_tiles
|
||||
self.y_tiles = y_tiles
|
||||
self.cell_size = cell_size
|
||||
|
||||
for i in range(self.y_tiles * self.x_tiles):
|
||||
self._array.append(0)
|
||||
|
||||
def __getitem__(self, (row, col)):
|
||||
return self._array[col + row * self.x_tiles]
|
||||
|
||||
def __setitem__(self, (row, col), value):
|
||||
self._array[col + row * self.x_tiles] = value
|
||||
|
||||
def compute_weight_at(self, x, y, width, height):
|
||||
weight = 0
|
||||
|
||||
for i in range(x, x + width):
|
||||
for j in range(y, y + height):
|
||||
weight += self[j, i]
|
||||
|
||||
return weight
|
||||
|
||||
def add_weight_at(self, x, y, width, height):
|
||||
for i in range(x, x + width):
|
||||
for j in range(y, y + height):
|
||||
self[j, i] += 1
|
||||
|
||||
def remove_weight_at(self, x, y, width, height):
|
||||
for i in range(x, x + width):
|
||||
for j in range(y, y + height):
|
||||
self[j, i] -= 1
|
||||
|
||||
class SpreadBox(hippo.CanvasBox, hippo.CanvasItem):
|
||||
__gtype_name__ = 'SugarSpreadBox'
|
||||
def __init__(self, **kwargs):
|
||||
hippo.CanvasBox.__init__(self, **kwargs)
|
||||
|
||||
self._grid = []
|
||||
self._grid = None
|
||||
self._center = None
|
||||
|
||||
for i in range(0, _GRID_WIDTH * _GRID_HEIGHT):
|
||||
self._grid.append(None)
|
||||
self._width = -1
|
||||
self._height = -1
|
||||
|
||||
def set_center_item(self, item):
|
||||
if self._center:
|
||||
self.remove(self._center)
|
||||
|
||||
self._center = item
|
||||
self.append(item, hippo.PACK_FIXED)
|
||||
self._center = item
|
||||
|
||||
self._layout_center()
|
||||
|
||||
def add_item(self, item):
|
||||
start_pos = int(random.random() * len(self._grid))
|
||||
|
||||
pos = start_pos
|
||||
while self._grid[pos] != None:
|
||||
pos = pos + 1
|
||||
if pos == len(self._grid):
|
||||
pos = 0
|
||||
elif pos == start_pos:
|
||||
break
|
||||
|
||||
self._grid[pos] = item
|
||||
|
||||
self.append(item, hippo.PACK_FIXED)
|
||||
|
||||
cell_y = int(pos / _GRID_WIDTH)
|
||||
cell_x = pos - cell_y * _GRID_WIDTH
|
||||
self.set_position(item, cell_x * _CELL_WIDTH, cell_y * _CELL_HEIGHT)
|
||||
self._layout_item(item)
|
||||
|
||||
def remove_item(self, item):
|
||||
for i in range(0, len(self._grid)):
|
||||
if self._grid[i] == item:
|
||||
self._grid[i] = None
|
||||
self.remove(item)
|
||||
|
||||
|
||||
def _place_item(self, item, x, y, w, h):
|
||||
self._grid.add_weight_at(x, y, w, h)
|
||||
self.set_position(item,
|
||||
self._grid.cell_size * x,
|
||||
self._grid.cell_size * y)
|
||||
|
||||
def _layout_item(self, item):
|
||||
if not self._grid:
|
||||
return
|
||||
|
||||
trials = _NUM_TRIALS
|
||||
placed = False
|
||||
best_weight = _MAX_WEIGHT
|
||||
|
||||
[width, height] = item.get_allocation()
|
||||
w = int(width / self._grid.cell_size)
|
||||
h = int(height / self._grid.cell_size)
|
||||
|
||||
while trials > 0 and not placed:
|
||||
x = int(random() * (self._grid.x_tiles - w))
|
||||
y = int(random() * (self._grid.y_tiles - h))
|
||||
|
||||
weight = self._grid.compute_weight_at(x, y, w, h)
|
||||
if weight == 0:
|
||||
self._place_item(item, x, y, w, h)
|
||||
placed = True
|
||||
elif weight < best_weight:
|
||||
best_x = x
|
||||
best_y = y
|
||||
|
||||
trials -= 1
|
||||
|
||||
if not placed:
|
||||
self._place_item(item, best_x, best_y, w, h)
|
||||
|
||||
def _layout(self):
|
||||
for item in self.get_children():
|
||||
if item != self._center:
|
||||
self._layout_item(item)
|
||||
|
||||
def _layout_center(self):
|
||||
if not self._center or not self._grid:
|
||||
return
|
||||
|
||||
[width, height] = self._center.get_allocation()
|
||||
x = (self._width - width) / 2
|
||||
y = (self._height - height) / 2
|
||||
self.set_position(self._center, x, y)
|
||||
|
||||
def do_allocate(self, width, height, origin_changed):
|
||||
hippo.CanvasBox.do_allocate(self, width, height, origin_changed)
|
||||
|
||||
if self._center:
|
||||
[icon_width, icon_height] = self._center.get_allocation()
|
||||
self.set_position(self._center, (width - icon_width) / 2,
|
||||
(height - icon_height) / 2)
|
||||
if width != self._width or height != self._height:
|
||||
cell_size = width / _X_TILES
|
||||
y_tiles = height / cell_size
|
||||
|
||||
self._grid = _Grid(_X_TILES, y_tiles, cell_size)
|
||||
self._width = width
|
||||
self._height = height
|
||||
|
||||
self._layout()
|
||||
|
||||
self._layout_center()
|
||||
|
||||
@ -38,7 +38,7 @@ class LogWriter:
|
||||
self._log_file = open(log_path, 'w')
|
||||
|
||||
def write_record(self, record):
|
||||
self.write(record.levelno, record.msg)
|
||||
self.write(record.levelno, record.getMessage())
|
||||
|
||||
def write(self, level, msg):
|
||||
if level == logging.ERROR:
|
||||
|
||||
@ -66,7 +66,9 @@ class _Profile(object):
|
||||
parsed = cp.read([config_path])
|
||||
|
||||
if cp.has_option('Buddy', 'NickName'):
|
||||
self.name = cp.get('Buddy', 'NickName')
|
||||
name = cp.get('Buddy', 'NickName')
|
||||
# decode nickname from ascii-safe chars to unicode
|
||||
self.name = name.decode("utf-8")
|
||||
|
||||
if cp.has_option('Buddy', 'Color'):
|
||||
self.color = XoColor(cp.get('Buddy', 'Color'))
|
||||
|
||||
0
tests/test-notebook.py
Normal file → Executable file
0
tests/test-notebook.py
Normal file → Executable file
@ -17,7 +17,7 @@
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
import sys
|
||||
import random
|
||||
from random import random
|
||||
|
||||
import pygtk
|
||||
pygtk.require('2.0')
|
||||
@ -33,14 +33,14 @@ from sugar.graphics.canvasicon import CanvasIcon
|
||||
|
||||
def _create_snowflake(parent, children):
|
||||
color = XoColor()
|
||||
icon = CanvasIcon(scale=1.0, xo_color=color,
|
||||
icon = CanvasIcon(scale=0.8, xo_color=color,
|
||||
icon_name='theme:object-link')
|
||||
parent.append(icon, hippo.PACK_FIXED)
|
||||
parent.set_root(icon)
|
||||
|
||||
for i in range(0, children):
|
||||
color = XoColor()
|
||||
icon = CanvasIcon(scale=0.5, xo_color=color,
|
||||
icon = CanvasIcon(scale=0.4, xo_color=color,
|
||||
icon_name='theme:stock-buddy')
|
||||
parent.append(icon, hippo.PACK_FIXED)
|
||||
|
||||
@ -55,23 +55,12 @@ root_box = SpreadBox(background_color=0xe2e2e2ff)
|
||||
canvas.set_root(root_box)
|
||||
|
||||
box = SnowflakeBox()
|
||||
snow_flake = _create_snowflake(box, 30)
|
||||
root_box.add_item(box)
|
||||
snow_flake = _create_snowflake(box, 0)
|
||||
root_box.set_center_item(box)
|
||||
|
||||
for i in range(0, 30):
|
||||
box = SnowflakeBox()
|
||||
snow_flake = _create_snowflake(box, 15)
|
||||
root_box.add_item(box)
|
||||
|
||||
box = SnowflakeBox()
|
||||
snow_flake = _create_snowflake(box, 10)
|
||||
root_box.add_item(box)
|
||||
|
||||
box = SnowflakeBox()
|
||||
snow_flake = _create_snowflake(box, 5)
|
||||
root_box.add_item(box)
|
||||
|
||||
box = SnowflakeBox()
|
||||
snow_flake = _create_snowflake(box, 2)
|
||||
snow_flake = _create_snowflake(box, int(2 + random() * 8))
|
||||
root_box.add_item(box)
|
||||
|
||||
canvas.show()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user