[Sugar-devel] Choosing to merge: a mockup

[Benjamin M. Schwartz]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mockup:
http://dev.laptop.org/~bemasc/merge_share_selection_mockup.png

Idea:
If I resume an Activity session from my Journal, and there is already a
session in progress with the same activity_id, and the Activity in
question supports automerge,  then Sugar will show me the above screen,
asking me whether I want to merge my work with the shared session, or to
work alone.  This is enough to enable basic asynchronous collaboration.

The screen simply has two buttons.  One is the image of the shared session
in question, identical to the one shown in the Neighborhood View.  The
other is an image of my XO icon.  The text below each button explains its
purpose, and also gives the name of the shared session and the local
session, as these may have diverged.  Knowing the names may help the user
to decide whether or not to merge.

As I understand it, the current activity architecture requires an activity
to know if it is a joining a shared session as soon as initialization
begins, so activity startup cannot proceed until the user makes a choice.

A rounded-corner highlight box indicates the currently selected button, in
a manner consistent with the rest of the  UI, hopefully enabling simple
keyboard shortcuts.  The default selection may be based on a heuristic to
predict whether the user is likely to join the shared session. For
example, the default selection may be to merge if the local copy is the
latest local version, and to remain separate if it is not.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)

iEYEARECAAYFAkpTkBUACgkQUJT6e6HFtqT8XACbBAa91c6oIvZvQYfJQvmIe6ht
LdIAoJfmeKU0VWvuK8gjeHvNbK8yKmur
=8W9M
-----END PGP SIGNATURE-----