Re: [Sugar-devel] Generating a pot file without the setup script ?
It worked :) ! Thank you 2011/5/25 James Cameron qu...@laptop.org On Sat, May 21, 2011 at 07:30:04PM +0200, laurent bernabe wrote: I tried generating pot from sugar image, but i had a python error (i went in ~/ Activities/LearningActivity.activity/ folder) $ ./setup.py genpot = errors : Traceback (most recent call last): File ./setup.py, line 24, in module bundlebuilder.start() File /opt/sweets/sugar-toolkit/src/sugar/activity/bundlebuilder.py, line 382, in start globals()['cmd_' + args[0]](config, args[1:]) File /opt/sweets/sugar-toolkit/src/sugar/activity/bundlebuilder.py, line 344, in cmd_genpot retcode = subprocess.call(args) File /usr/lib/python2.6/subprocess.py, line 480, in call return Popen(*popenargs, **kwargs).wait() File /usr/lib/python2.6/subprocess.py, line 633, in __init__ errread, errwrite) File /usr/lib/python2.6/subprocess.py, line 1139, in _execute_child raise child_exception OSError: [Errno 2] No such file or directory So, how could i correct it ? Install the gettext package. (The error shows that xgettext binary cannot be called by the subprocess. I looked at line 382 in sugar-toolkit/src/sugar/activity/bundlebuilder.py to find out what it was doing and saw xgettext was referenced, so it is likely that you haven't got it installed.) -- James Cameron http://quozl.linux.org.au/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [ASLO] Release OOo4Kids-2
Hi Sridhar, Sridhar Dhanapalan srid...@laptop.org.au writes: This is looking really good! The limiting factor is journal support. Are there plans to support the journal in this activity? I don't think so: Eric and his team are putting lots of energy to make OOo4kids available for any platform, but complete sugarization might be extra work that they cannot afford for now. Eric, please correct me if I'm wrong. Maybe someone can take this task over? -- Bastien ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Field Feedback --- looking for a new task?
Hi, looking for a new project to work on? We have been collecting some items that have been reported to us when talking to teachers, teacher trainers, learners and by observing in schools when visiting the deployments in Uruguay and La Rioja (Argentina) [1]. If you are wondering what to work on next, are looking for ideas for a new activity you want to develop here is where you might want to look. This is not a fully fledged out process (yet), but I thought I better share those now than investing in a feedback-loop process from the start. Initiatives in that regard welcome! We can turn the items on the page into full Feature pages later and of course feel free to ask for more detail etc here on the list. Regards, Simon [1] http://wiki.sugarlabs.org/go/Features/FieldFeedback ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [DESIGN] meeting next Sunday, 29 May?
On 25 May 2011, at 04:02, Christian Marc Schmidt christianm...@gmail.com wrote: How about we try for Sunday at 16:00 UTC (9am PT/12pm ET)? That looks good for me also, see you all there. --Gary Christian On Sun, May 22, 2011 at 11:46 AM, Walter Bender walter.ben...@gmail.com wrote: We are overdue for another design meeting. Does next Sunday work? Gary and Christian, since you two are at the extremes of timezones, do you want to propose a meeting time? Sascha would like to discuss some UI changes to the Neighborhood View to address some issues concerning access points (The current model (1:1 AP-network mapping) isn't powerful enough for real-life scenarios (hidden SSIDs etc.).) -walter -- Walter Bender Sugar Labs http://www.sugarlabs.org -- anyth...@christianmarcschmidt.com 917/ 575 0013 http://www.christianmarcschmidt.com http://www.facebook.com/christianmarcschmidt http://www.linkedin.com/in/christianmarcschmidt http://twitter.com/cms_ Skype: christianmarcschmidt ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Important_update_needed_for_liveusb-creator_in_f15_final_release
On Wed, May 25, 2011 at 12:53 AM, Thomas C Gilliard satel...@bendbroadband.com wrote: http://wiki.sugarlabs.org/go/Sugar_Creation_Kit#Important_update_needed_for_liveusb-creator_in_f15_final_release No Persistence unless update http://harald.fedorapeople.org/downloads/dracut/dracut-009-11.fc15/dracut-009-11.fc15.noarch.rpm This does not seem to have made the f15 release... No it hasn't, I'll ensure its in the final SoaS release when its cut. Thomas: please search the updates interface and reference that where necessary to check what the state is (it also provides properly signed packages rather than random ones). This update is currently in testing: https://admin.fedoraproject.org/updates/dracut-009-11.fc15 Peter ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Fwd: [Sur] La bestia que renace una y otra vez
I will respond to this but would like to discuss it with the two of you first. regards. -walter -- Forwarded message -- From: nanon...@mediagala.com Date: 2011/5/25 Subject: [Sur] La bestia que renace una y otra vez To: OLPC para usuarios, docentes, voluntarios y administradores olpc-...@lists.laptop.org *ana.cichero wrote: ...la idea del diario está buenísima y es adecuado al volumen de info gigante que van a enfrentar los más chicos que nosotros./es una jeraquía distinta. --- * Yo no soy pedagogo, ni Maestro ni sé nada de cómo enseñarle cosa a los niños de Escuela, pero lo que sí sé es que el Diario como está implementado Actualmente es HORRIBLE (y soy muy generoso usando ese adjetivo). SI en teoría el uso del diario es adapto para los niños.. eso no lo sé, como ya dije, no soy teórico licenciado en las cumbres de lugares altisonantes. Pero sí sabemos que la forma en que actualmente está implementado el Diario está MAL HECHA (de nuevo soy muy generoso en el adjetivo). -- Por ejemplo: SUpongamos que todos estamos de acuerdo en el uso del DIARIO... supongamos hipoteticamente que no queremos ver los directorios Yo me pregunto: * ¿porqué diablos le metieron tanta meta-data y cosas por el estilo al sistema de archivos del Diario ?* ¿que necesidad tenían de complicarnos la vida?? Podían haber puesto todo en un directorio y ya está! ¿porqué inventar un sistema de archivos cuando Linux ya viene con un sistema de archivos?? Si por lo menos estuviese bien hecho,,.. y fuese transparente para el usuario.. vaya y pase, pero el problema es que *al estar tan mal implementado en vez de ayudar es un punto en contra del Sugar!* * Por ejemplo: gracias a esa ridiculez de los meta-datos, es imposible leer un pendrive con cientos o miles de archivos, porque la XO es tan lenta que se pasa horas creando los meta-datos de todos los archivos, y al final no se puede leer el pendrive en el diario (no aparece el pendrive en el diario, pero sí se puede leer desde terminal o desde navegar). Solo se pueden leer los pendrives con pocos archivos.* --- ¿que les costaba hacer como hacen en Windows, que la gente no sabe nada de Directorios o no tienen ganas de organizar los archivos, y todo va a parar a Mis Documentos En ese caso la cosa funciona en forma parecida al diario: todo está en mis documentos, y la gente no sabe como encontrar los archivos viejos, porque están todos mezclados, es un* rejunterío infernal de archivos inútiles*, y uno de cada mil archivos es útil. *NOTA:* le pido perdón a los presentes por escribir malas palabras en esta santa lista (me refiero a la palabra W) ¿no se podría hacer algo similar en el sugar? dejar el diario como está (visualmente), pero dejarlo en un directorio fijo, de esa forma estamos todos contentos, los que quieren directorio (usando cualquier explorador de archivos) y los que no quieren directorios. - Sí,, sí.. ya sé la respuesta técnica bla, bla, sistema de seguridad rainbow, .. bla bla bla ... permisos de los archivos, seguridad para que las aplicaciones no toquen los archivos de otras aplicaciones bla, bla bla. Lo quieren hacer tan perfecto este famoso diario que al final resulta inutil!!, sirve solo para complicarnos la vida. La que no sé es la respuesta teórica: ¿porqué lo inventaron así? y porque no hay tutía http://www.wikilengua.org/index.php/no_hay_tut%C3%ADa que los convenza de otra cosa ? A ver si se convencen que la vida no es perfecta!!! y no es posible hacer la perfección de un día para el otro, tenems que hacer pequeños cambios a la vez, no se puede decir tirá a la basura todo lo que sabés y empezamos de cero, vamos a inventar la rueda y luego veremos.. Y así de apoco vamos mejorando, pero de un día para el otro es imposible, y no solo : es contraproducente, como está sucediendo ahora. - Hipótesis: SUpongamos ahora que todos nos ponemos de acuerdo que el uso del diario es algo bueno y que hay que dejarlo como está Pues resulta que está MAL HECHO ese es el problema principal, no puede ser que inventen un sistema de archivos solo para el sugar! y que sea incompatible con el sistema de archivos de Linux!!! ¿para que quieren inventar de nuevo el agua caliente? POr ejemplo: recuerdo allá por el 2008 que no se podían enviar archivos adjuntos por e-.mail (ni adinet ni gmail, recuerdo)... luego lo arreglaron.. y ahora resulta que el mismo problema volvió nuevamente es la bestia que renace una y otra vez?? En este momento (con la imagen nueva en Uruguay, os1bdxuy.imghttp://ceibal.edu.uy/Portal.Base/Web/VerContenido.aspx?GUID=b63e7fa5-5ec2-42aa-9c0d-ac483620d61fID=203132 - sugar 0.88 - Navegar v.116) no es posible enviar adjuntos usando Gmail no se
[Sugar-devel] [PATCH sugar] Display title in palette of shared activity OLPC #10676
The patch does display the activity name as primary text and the session title as secondary text. This is coherent with the palette of an activity in the frame. Signed-off-by: Simon Schampijer si...@laptop.org --- src/jarabe/desktop/meshbox.py |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index 3d1e52a..83740d0 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -94,12 +94,14 @@ class ActivityView(hippo.CanvasBox): return icon def _create_palette(self): -p_text = glib.markup_escape_text(self._model.bundle.get_name()) +primary_text = glib.markup_escape_text(self._model.bundle.get_name()) +secondary_text = glib.markup_escape_text(self._model.get_name()) p_icon = Icon(file=self._model.bundle.get_icon(), xo_color=self._model.get_color()) p_icon.props.icon_size = gtk.ICON_SIZE_LARGE_TOOLBAR p = palette.Palette(None, -primary_text=p_text, +primary_text=primary_text, +secondary_text=secondary_text, icon=p_icon) private = self._model.props.private -- 1.7.4 ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Fwd: [Sur] La bestia que renace una y otra vez
Excerpts from Walter Bender's message of Wed May 25 14:36:59 +0200 2011: I will respond to this but would like to discuss it with the two of you first. (Assuming you mean the discussion to be open to everyone, but would like to invite Simon and me in particular as you CC'ed sugar-devel) I find it rather hard to reply to the forwarded mail - and not just because of language issues. It conflates a lot of different concepts and issues (e.g. Journal meta-data vs. Rainbow). I also got the impression that the various different organisations related to Sugar and the OS used in Uruguay - including the government - are all put into the same they pot. Trying to distil the actual complaints: 1. Journal meta-data is complicated 2. Journal (meta-data?) is not transparent to the user 3. Reading a USB stick with many files on it is slow 4. Finding old Journal entries is hard 5. Incompatible with the Linux file system (whatever that means) 6. Regression when attaching files to emails / Adineta(?) / GMail For a useful response, I'd need a lot more detail about each individual issue - including the software versions (base distro, Sugar, ...). Some of it might have already been solved (e.g. the sort by creation time feature might be enough for #4). Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Fwd: [Sur] La bestia que renace una y otra vez
Hi all, 2011/5/25 Sascha Silbe sascha-ml-reply-to-201...@silbe.org Excerpts from Walter Bender's message of Wed May 25 14:36:59 +0200 2011: I will respond to this but would like to discuss it with the two of you first. (Assuming you mean the discussion to be open to everyone, but would like to invite Simon and me in particular as you CC'ed sugar-devel) I find it rather hard to reply to the forwarded mail - and not just because of language issues. It conflates a lot of different concepts and issues (e.g. Journal meta-data vs. Rainbow). I also got the impression that the various different organisations related to Sugar and the OS used in Uruguay - including the government - are all put into the same they pot. Trying to distil the actual complaints: 1. Journal meta-data is complicated 2. Journal (meta-data?) is not transparent to the user 3. Reading a USB stick with many files on it is slow 4. Finding old Journal entries is hard 5. Incompatible with the Linux file system (whatever that means) I think that is regarding to manage journal files like any other linux file in any other place. To have access to the journal files we need to use sugar.datastore, he told that he can't searching files using common linux commands like ls, find, etc. I think that the point 2 talks about the same thing. 6. Regression when attaching files to emails / Adineta(?) / GMail Adinet is an uruguayan webmail (http://www.adinet.com.uy) For a useful response, I'd need a lot more detail about each individual issue - including the software versions (base distro, Sugar, ...). Some of it might have already been solved (e.g. the sort by creation time feature might be enough for #4). As you know, in uruguay we have distributed many different builds and I don't know which is the specific version that he refers, but the latest is based on F11-Sugar 0.88-Dextrose Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel cheers, Esteban. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Fwd: [Sur] La bestia que renace una y otra vez
On Wed, May 25, 2011 at 10:01 AM, Sascha Silbe sascha-ml-reply-to-201...@silbe.org wrote: Trying to distil the actual complaints: Trying to help as a native Spanish speaker... nanonano's points are simpler - The Journal is $%@%$^ - The Journal / having to enter or use metadata complicates our life. - So many entries (many useless) in the Journal make it too hard to use. - Why isn't Sugar using plain files directories like a vanilla linux or Windows? ... There is a long list of improvements to be made to the Journal; I am not sure which version nanonano is using, but it's clearly a frustrating experience. But I suspect his list of complaints is a bit too muddy to be immediately useful. Perhaps, with a bit more patience, some specific improvements can be described and explored... cheers, m -- martin.langh...@gmail.com mar...@laptop.org -- Software Architect - OLPC - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [ANN] Dr. Geo II release 11.06
Announced there http://blog.ofset.org/hilaire/index.php?post/drgeo-11-06 The XO version of Dr. Geo II comes with the new COG Smalltalk Virtual Machine from Eliot Miranda, giving an average boost of +300% Feedback welcome! Enjoy Hilaire -- Education 0.2 -- http://blog.ofset.org/hilaire ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH sugar] Convert nick to a str, follow up on OLPC #10735
Commit dad5ad7f4477b84d15705129cd7e97bdbe9457fe did not
solve the issue for non-english systems.
---
src/jarabe/frame/activitiestray.py |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/jarabe/frame/activitiestray.py
b/src/jarabe/frame/activitiestray.py
index eea0a15..5445b49 100644
--- a/src/jarabe/frame/activitiestray.py
+++ b/src/jarabe/frame/activitiestray.py
@@ -545,7 +545,7 @@ class IncomingTransferPalette(BaseTransferPalette):
self.file_transfer.connect('notify::state', self.__notify_state_cb)
-nick = self.file_transfer.buddy.props.nick
+nick = str(self.file_transfer.buddy.props.nick)
self.props.secondary_text = _('Transfer from %s') % (nick,)
self._update()
@@ -676,7 +676,7 @@ class OutgoingTransferPalette(BaseTransferPalette):
self.file_transfer.connect('notify::state', self.__notify_state_cb)
-nick = file_transfer.buddy.props.nick
+nick = str(file_transfer.buddy.props.nick)
self.props.secondary_text = _('Transfer to %s') % (nick,)
self._update()
--
1.7.4
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Pootle has messed up sugar-0.84
Hi, Something weird has happened with sugar.git's sucrose-0.84 branch. Take a look at extensions/cpsection/network/model.py, there is no mention of rfkill Then do a git reset --hard a09b6dc0264f0 (thats just going back a few commits) and the rfkill code magically appears. Daniel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [ANN] Dr. Geo II release 11.06
On Wed, May 25, 2011 at 12:11 PM, Hilaire Fernandes hilaire.fernan...@gmail.com wrote: Sure, it should be wrapped into eToys. However, as far as I can see, Etoys4XO does not contain DrGeoII, or am I wrong? Hilaire I'm judging from the fact that we have a DrGeoII-Core.po file in the eToys project. I'm not entirely sure about the eToys build process, just the L10n we host on Pootle. http://translate.sugarlabs.org/fr/etoys_new/DrGeoII-Core.po?view_mode=translate cjl ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH] add copy bundle capability to view source
Attached is a first pass at a patch to enable copying activities from the View Source palette. The basic idea is quite simple: a submenu with a copy button has been added to the view bundle source radio button that will make a copy of an activity into $HOME/Activities. The name of the copy is My[ExistingActivityName]. I needed to also create a new activity bundle_id, which is [ExistingBundleID]_my_copy. Seems to work. Feedback about both the patch and the general idea welcome and appreciated. regards. -walter (PS: Note that there is already a copy to Journal button for activity-specific source code on the view activity source radio button.) -- Walter Bender Sugar Labs http://www.sugarlabs.org 0001-added-support-for-copying-bundle-fixed-bundle_name-p.patch Description: Binary data ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [ANN] Dr. Geo II release 11.06
Am 25.05.2011 um 18:11 schrieb Hilaire Fernandes hilaire.fernan...@gmail.com: Sure, it should be wrapped into eToys. However, as far as I can see, Etoys4XO does not contain DrGeoII, or am I wrong? I'm rather surprised you think that. There is no difference between the Sugar version and the desktop version of Etoys. You just need to upgrade to a more recent OS that has Etoys 4.1. DrGeoII has been in there since last year. - Bert - Hilaire Le 25/05/2011 17:43, Chris Leonard a écrit : On Wed, May 25, 2011 at 11:39 AM, Hilaire Fernandes hilaire.fernan...@gmail.com wrote: Announced there http://blog.ofset.org/hilaire/index.php?post/drgeo-11-06 The XO version of Dr. Geo II comes with the new COG Smalltalk Virtual Machine from Eliot Miranda, giving an average boost of +300% Feedback welcome! Hilaire, Is this going to be wrapped into eToys like the currebt Dr.Geo II? I'm asking mostly from a localization perspective. cjl -- Education 0.2 -- http://blog.ofset.org/hilaire ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH] Fall back to old style toolbars in old sugar
From: Sebastian Silva icar...@sugarlabs.org
Based on patch by Wade from 2009:
http://git.sugarlabs.org/~wadeb/browse/backwards-compatibility/commit/584939d3bc217b9463703e9a903caadf80c50d00
---
webactivity.py | 87 +---
webtoolbar.py | 47 ++
2 files changed, 92 insertions(+), 42 deletions(-)
diff --git a/webactivity.py b/webactivity.py
index 5f1ea5e..f43c9b4 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -47,15 +47,26 @@ from sugar.graphics.tray import HTray
from sugar import profile
from sugar.graphics.alert import Alert
from sugar.graphics.icon import Icon
-from sugar.graphics.toolbarbox import ToolbarButton
from sugar import mime
+# Attempt to import the new toolbar classes. If the import fails,
+# fall back to the old toolbar style.
+try:
+from sugar.graphics.toolbarbox import ToolbarButton
+NEW_TOOLBARS = True
+except ImportError:
+NEW_TOOLBARS = False
+
PROFILE_VERSION = 2
_profile_version = 0
_profile_path = os.path.join(activity.get_activity_root(), 'data/gecko')
_version_file = os.path.join(_profile_path, 'version')
+if not NEW_TOOLBARS:
+_TOOLBAR_EDIT = 1
+_TOOLBAR_BROWSE = 2
+
if os.path.exists(_version_file):
f = open(_version_file)
_profile_version = int(f.read())
@@ -208,34 +219,56 @@ class WebActivity(activity.Activity):
logging.warning('Not enabling the multiple tabs feature due'
' to a bug in cairo/mozilla')
-self._primary_toolbar = PrimaryToolbar(self._tabbed_view, self,
-self._disable_multiple_tabs)
-self._primary_toolbar.connect('add-link', self._link_add_button_cb)
-
-self._primary_toolbar.connect('add-tab', self._new_tab_cb)
-
-self._primary_toolbar.connect('go-home', self._go_home_button_cb)
-
self._tray = HTray()
self.set_tray(self._tray, gtk.POS_BOTTOM)
self._tray.show()
+self._primary_toolbar = PrimaryToolbar(self._tabbed_view, self,
+self._disable_multiple_tabs)
self._edit_toolbar = EditToolbar(self)
-self._edit_toolbar_button = ToolbarButton(
-page=self._edit_toolbar,
-icon_name='toolbar-edit')
-self._primary_toolbar.toolbar.insert(
-self._edit_toolbar_button, 1)
-
self._view_toolbar = ViewToolbar(self)
-view_toolbar_button = ToolbarButton(
-page=self._view_toolbar,
-icon_name='toolbar-view')
-self._primary_toolbar.toolbar.insert(
-view_toolbar_button, 2)
-self._primary_toolbar.show_all()
-self.set_toolbar_box(self._primary_toolbar)
+self._primary_toolbar.connect('add-link', self._link_add_button_cb)
+
+self._primary_toolbar.connect('add-tab', self._new_tab_cb)
+
+self._primary_toolbar.connect('go-home', self._go_home_button_cb)
+
+if NEW_TOOLBARS:
+logging.debug('Using new toolbars')
+
+self._edit_toolbar_button = ToolbarButton(
+page=self._edit_toolbar,
+icon_name='toolbar-edit')
+self._primary_toolbar.toolbar.insert(
+self._edit_toolbar_button, 1)
+
+view_toolbar_button = ToolbarButton(
+page=self._view_toolbar,
+icon_name='toolbar-view')
+self._primary_toolbar.toolbar.insert(
+view_toolbar_button, 2)
+
+self._primary_toolbar.show_all()
+self.set_toolbar_box(self._primary_toolbar)
+else:
+_logger.debug('Using old toolbars')
+
+toolbox = activity.ActivityToolbox(self)
+
+toolbox.add_toolbar(_('Edit'), self._edit_toolbar)
+self._edit_toolbar.show()
+
+toolbox.add_toolbar(_('Browse'), self._primary_toolbar)
+self._primary_toolbar.show()
+
+toolbox.add_toolbar(_('View'), self._view_toolbar)
+self._view_toolbar.show()
+
+self.set_toolbox(toolbox)
+toolbox.show()
+
+self.toolbox.set_current_toolbar(_TOOLBAR_BROWSE)
self.set_canvas(self._tabbed_view)
self._tabbed_view.show()
@@ -494,10 +527,15 @@ class WebActivity(activity.Activity):
self._add_link()
elif key_name == 'f':
_logger.debug('keyboard: Find')
-self._edit_toolbar_button.set_expanded(True)
+if NEW_TOOLBARS:
+self._edit_toolbar_button.set_expanded(True)
+else:
+self.toolbox.set_current_toolbar(_TOOLBAR_EDIT)
self._edit_toolbar.search_entry.grab_focus()
elif key_name == 'l':
_logger.debug('keyboard: Focus url entry')
+if not NEW_TOOLBARS:
+
