Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--downloadmanager.py1
-rwxr-xr-xwebactivity.py16
3 files changed, 10 insertions, 11 deletions
diff --git a/NEWS b/NEWS
index 475b9bc..080fefd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
+* Make use of the tray support in sugar activity window (erikos)
+
68
+* Adopt 'go' icons (marco)
+
67
* Use ctrl+t for tray visibility, this should move to sugar-graphics-window (erikos)
diff --git a/downloadmanager.py b/downloadmanager.py
index e0d39db..16ea128 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -119,7 +119,6 @@ class Download:
self._last_update_time = 0
self._last_update_percent = 0
self._cancelable = cancelable
- _activity.alert_position = 1
return NS_OK
def onStateChange(self, web_progress, request, state_flags, status):
diff --git a/webactivity.py b/webactivity.py
index a0a2784..444fb76 100755
--- a/webactivity.py
+++ b/webactivity.py
@@ -85,7 +85,13 @@ class WebActivity(activity.Activity):
self.set_toolbox(toolbox)
toolbox.show()
+ self.set_canvas(self._browser)
+ self._browser.show()
+
self._tray = HTray()
+ self.set_tray(self._tray, gtk.POS_BOTTOM)
+ self._tray.show()
+
self.session_history = sessionhistory.get_instance()
self.session_history.connect('session-link-changed', self._session_history_changed_cb)
self.toolbar.connect('add-link', self._link_add_button_cb)
@@ -97,16 +103,6 @@ class WebActivity(activity.Activity):
self.model = Model()
self.model.connect('add_link', self._add_link_model_cb)
- self._main_view = gtk.VBox()
- self.set_canvas(self._main_view)
- self._main_view.show()
-
- self._main_view.pack_start(self._browser)
- self._browser.show()
-
- self._main_view.pack_start(self._tray, expand=False)
- self._tray.show()
-
self.current = _('blank')
self.webtitle = _('blank')
self.connect('key-press-event', self._key_press_cb)