Merge design-review-3-no-tabs

Conflicts:

	activities/browser/BrowserActivity.py
	shell/ActivityContainer.py
	shell/ActivityHost.py
	shell/ConsoleLogger.py
	shell/HomeWindow.py
	shell/Shell.py
	shell/WindowManager.py
	sugar/activity/Activity.py

1 files changed, 42 insertions, 46 deletions

diff --git a/activities/browser/BrowserActivity.py b/activities/browser/BrowserActivity.py
index 0068f20..53cf37b 100644
--- a/activities/browser/BrowserActivity.py
+++ b/activities/browser/BrowserActivity.py
@@ -26,13 +26,53 @@ class BrowserActivity(Activity):
 	def __init__(self, args):
 		Activity.__init__(self, _BROWSER_ACTIVITY_TYPE)
 
-		self.uri = args[0]
+		if len(args) > 0:
+			self.uri = args[0]
+		else:
+			self.uri = 'http://www.google.com'
 		
 		self._mode = BrowserActivity.SOLO
 		self._share_service = None
 		self._model_service = None
 		self._notif_service = None
 		self._model = None
+
+		self.set_title("Web Page")
+
+		vbox = gtk.VBox()
+
+		self._notif_bar = NotificationBar()
+		vbox.pack_start(self._notif_bar, False)
+		self._notif_bar.connect('action', self.__notif_bar_action_cb)
+
+		self.embed = geckoembed.Embed()
+		self.embed.connect("title", self.__title_cb)
+		vbox.pack_start(self.embed)
+		
+		self.embed.show()
+		self.embed.load_address(self.uri)
+		
+		nav_toolbar = NavigationToolbar(self)
+		vbox.pack_start(nav_toolbar, False)
+		nav_toolbar.show()
+
+		self.add(vbox)
+		vbox.show()
+
+		logging.debug('Start presence service')
+		self._pservice = PresenceService.get_instance()
+		self._pservice.start()
+		
+		logging.debug('Track browser activities')
+		self._pservice.connect('service-appeared', self._service_appeared_cb)
+		self._pservice.track_service_type(_BROWSER_ACTIVITY_TYPE)
+		self._pservice.track_service_type(LocalModel.SERVICE_TYPE)
+
+		# Join the shared activity if we were started from one
+		if self._initial_service:
+			logging.debug("BrowserActivity joining shared activity %s" %
+						  self._initial_service.get_activity_id())
+			self._pservice.join_shared_activity(self._initial_service)
 	
 	def _service_appeared_cb(self, pservice, buddy, service):
 		# Make sure the service is for our activity
@@ -75,50 +115,6 @@ class BrowserActivity(Activity):
 			self._notif_bar.set_icon('stock_shared-by-me')
 			self._notif_bar.show()
 
-	def on_connected_to_shell(self):
-		self.set_ellipsize_tab(True)
-		self.set_can_close(True)
-		self.set_tab_text("Web Page")
-		self.set_tab_icon(name="web-browser")
-		self.set_show_tab_icon(True)
-
-		vbox = gtk.VBox()
-
-		self._notif_bar = NotificationBar()
-		vbox.pack_start(self._notif_bar, False)
-		self._notif_bar.connect('action', self.__notif_bar_action_cb)
-
-		self.embed = geckoembed.Embed()
-		self.embed.connect("title", self.__title_cb)
-		vbox.pack_start(self.embed)
-		
-		self.embed.show()
-		self.embed.load_address(self.uri)
-		
-		nav_toolbar = NavigationToolbar(self)
-		vbox.pack_start(nav_toolbar, False)
-		nav_toolbar.show()
-
-		plug = self.gtk_plug()		
-		plug.add(vbox)
-		plug.show()
-
-		vbox.show()
-
-		logging.debug('Start presence service')
-		self._pservice = PresenceService.get_instance()
-		self._pservice.start()
-		
-		logging.debug('Track browser activities')
-		self._pservice.connect('service-appeared', self._service_appeared_cb)
-		self._pservice.track_service_type(_BROWSER_ACTIVITY_TYPE)
-		self._pservice.track_service_type(LocalModel.SERVICE_TYPE)
-
-		# Join the shared activity if we were started from one
-		if self._initial_service:
-			logging.debug("BrowserActivity joining shared activity %s" % self._initial_service.get_activity_id())
-			self._pservice.join_shared_activity(self._initial_service)
-
 	def get_embed(self):
 		return self.embed
 	
@@ -139,7 +135,7 @@ class BrowserActivity(Activity):
 		self.set_mode(BrowserActivity.LEADING)
 
 	def __title_cb(self, embed):
-		self.set_tab_text(embed.get_title())
+		self.set_title(embed.get_title())
 
 	def __shared_location_changed_cb(self, model, key):
 		self.set_has_changes(True)