sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve the page sharing UI

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-05-18 16:35:12 -04:00
parent 6f77290880
commit fd8a921d96
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sugar/browser/NotificationBar.py
View File

@ -42,7 +42,7 @@ class NotificationBar(gtk.HBox):
return False return False
def set_text(self, text): def set_text(self, text):
self._text_label.set_markup('<b>' + text + '</b>') self._text_label.set_markup(text)
def set_action(self, action_id, action_text): def set_action(self, action_id, action_text):
self._action_id = action_id self._action_id = action_id

24
sugar/browser/browser.py
View File

@ -173,11 +173,16 @@ class BrowserActivity(activity.Activity):
self._group = group self._group = group
self._mode = BrowserActivity.SOLO self._mode = BrowserActivity.SOLO
def _update_shared_location(self):
address = self.embed.get_address()
self._model.set_value('address', address)
title = self.embed.get_title()
self._model.set_value('title', title)
def __notif_bar_action_cb(self, bar, action_id): def __notif_bar_action_cb(self, bar, action_id):
print action_id print action_id
if action_id == 'set_shared_location': if action_id == 'set_shared_location':
address = self.embed.get_address() self._update_shared_location()
self._model.set_value('address', address)
elif action_id == 'goto_shared_location': elif action_id == 'goto_shared_location':
address = self._model.get_value("address") address = self._model.get_value("address")
print address print address
@ -187,8 +192,8 @@ class BrowserActivity(activity.Activity):
def set_mode(self, mode): def set_mode(self, mode):
self._mode = mode self._mode = mode
if mode == BrowserActivity.LEADING: if mode == BrowserActivity.LEADING:
self._notif_bar.set_text("You are leading the browsing.") self._notif_bar.set_text("Share this page with the group.")
self._notif_bar.set_action("set_shared_location", "Move Here") self._notif_bar.set_action("set_shared_location", "Share")
self._notif_bar.show() self._notif_bar.show()
def _setup_shared(self, uri): def _setup_shared(self, uri):
@ -235,7 +240,8 @@ class BrowserActivity(activity.Activity):
def share(self): def share(self):
address = self.embed.get_address() address = self.embed.get_address()
self._model = self._group.get_store().create_model(address) self._model = self._group.get_store().create_model(address)
self._model.set_value('address', address) self._model.set_value('owner', self._group.get_owner().get_nick_name())
self._update_shared_location()
self.set_mode(BrowserActivity.LEADING) self.set_mode(BrowserActivity.LEADING)
bus = dbus.SessionBus() bus = dbus.SessionBus()
@ -254,8 +260,12 @@ class BrowserActivity(activity.Activity):
self._notify_shared_location_change() self._notify_shared_location_change()
def _notify_shared_location_change(self): def _notify_shared_location_change(self):
self._notif_bar.set_text("The lead moved to a new location.") owner = self._model.get_value('owner')
self._notif_bar.set_action("goto_shared_location", "Move There") title = self._model.get_value('title')
text = '<b>' + owner + '</b> is reading <i>' + title + '</i>'
self._notif_bar.set_text(text)
self._notif_bar.set_action("goto_shared_location", "Go There")
self._notif_bar.show() self._notif_bar.show()
def activity_on_close_from_user(self): def activity_on_close_from_user(self):

3
sugar/p2p/Group.py
View File

@ -58,6 +58,8 @@ class LocalGroup(Group):
self._pdiscovery.add_service_listener(self._on_service_change) self._pdiscovery.add_service_listener(self._on_service_change)
self._pdiscovery.start() self._pdiscovery.start()
self._owner = Owner(self)
def get_owner(self): def get_owner(self):
return self._owner return self._owner
@ -71,7 +73,6 @@ class LocalGroup(Group):
del self._services[service_id] del self._services[service_id]
def join(self): def join(self):
self._owner = Owner(self)
self._owner.register() self._owner.register()
def get_service(self, name, stype): def get_service(self, name, stype):