Shared activities displayed with activity name, not instance/journal name in the sugar network view

[greenfeld]

Shared activities historically have been displayed with the name a user has assigned for the shared instance (such as "Chat Activity", "My Chat", etc.), which eventually gets copied to the journal in Sugar's Network View.

Right now in 11.2.0 os7 activities are shown in the Network View with only the core activity name shown ("Chat", "Labyrinth", etc.). The 10.1.3 release shows the instance name that can be changed by children/end-users instead.

We need to decide which way to go for the 11.2.0 release.

[erikos]

diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 3d1e52a..00fd949 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -94,7 +94,7 @@ class ActivityView(hippo.CanvasBox):
         return icon
 
     def _create_palette(self):
-        p_text = glib.markup_escape_text(self._model.bundle.get_name())
+        p_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

Actually a simple patch. This does restore the previous behavior.

[erikos]

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

Like in the activity tray in the frame we should maybe display the activity name AND the title of the session.

[erikos]

Example of activity name and session title in the palette

[erikos]

http://lists.sugarlabs.org/archive/sugar-devel/2011-May/031460.html

[erikos]

|TestCase|

- on A open Memorize, name the instance and share it

- on A and B the palette text in the neighborhood view should display the activity name AND the title of the session. In Spanish: "Memorizar" "Vacaciones" In German: "Merken" "Ferien"

[erikos]

One thing I just noted is: On B if you open the activity the title does not have the 'custom title' (activity instance title) from A for the activity neither the activity frame palette have it. I will have a look at it. There is as well http://bugs.sugarlabs.org/ticket/1474 which I marked for having a look at it.

[dsd]

test in 11.2.0 build 21

[greenfeld]

In 11.2.0 build 22 we show shared activity sessions by their (localized) Activity name and the (non-translated) current user-supplied session title.

Tested with both Salut and Gabble.

[erikos]

I reopen this one because it is still under review.

[erikos]

In the follow-up patch I made the palette on demand: http://lists.sugarlabs.org/archive/sugar-devel/2011-July/032188.html

[erikos]

|TestCase|

- A opens activity set the name to 'X' and shares it

---> on his nb view the activity palette shows 'X' as the secondary title

- A changes the name activity name to 'Y'

---> on his nb view the activity palette shows 'Y' as the secondary title

[erikos]

http://git.sugarlabs.org/sugar/mainline/commit/16506b00ee285fa4c5c1ad43e7b0f1e84802f86e

[erikos]

in sugar-0.92.4-1.fc14.olpc.noarch.rpm (in my public repo)

|TestCase|

• open an activity (e.g. Memorize)

• change the title in the activity

• go to the nb view and open the palette of the shared activity

---> the palette should contain the activity name and the instance/journal name as secondary text

(be aware of #11087 when testing)

[dsd]

test in 11.3.0 build 1

[greenfeld]

Fixed in 11.3.0 os2.