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

Merge branch 'master' of github.com:sugarlabs/sugar-toolkit-gtk3

Browse Source
This commit is contained in:
Pootle daemon 2013-08-31 00:32:11 -04:00
commit 5ba632a34a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sugar3/activity/webactivity.py
View File

@ -44,6 +44,7 @@ class WebActivity(Gtk.Window):
self.connect("key-press-event", self._key_press_event_cb) self.connect("key-press-event", self._key_press_event_cb)
self.connect('realize', self._realize_cb) self.connect('realize', self._realize_cb)
self.connect('destroy', self._destroy_cb)
context = WebKit2.WebContext.get_default() context = WebKit2.WebContext.get_default()
context.register_uri_scheme("activity", self._app_scheme_cb, None) context.register_uri_scheme("activity", self._app_scheme_cb, None)
@ -59,6 +60,8 @@ class WebActivity(Gtk.Window):
self._web_view.load_uri("activity://%s/index.html" % self._bundle_id) self._web_view.load_uri("activity://%s/index.html" % self._bundle_id)
self.set_title(activity.get_bundle_name())
def run_main_loop(self): def run_main_loop(self):
Gtk.main() Gtk.main()
@ -67,6 +70,10 @@ class WebActivity(Gtk.Window):
SugarExt.wm_set_bundle_id(xid, self._bundle_id) SugarExt.wm_set_bundle_id(xid, self._bundle_id)
SugarExt.wm_set_activity_id(xid, str(self._activity_id)) SugarExt.wm_set_activity_id(xid, str(self._activity_id))
def _destroy_cb(self, window):
self.destroy()
Gtk.main_quit()
def _loading_changed_cb(self, web_view, load_event): def _loading_changed_cb(self, web_view, load_event):
if load_event == WebKit2.LoadEvent.FINISHED: if load_event == WebKit2.LoadEvent.FINISHED:
key = os.environ["SUGAR_APISOCKET_KEY"] key = os.environ["SUGAR_APISOCKET_KEY"]