Rebase ui-fixes in Dextrose over Record-86: #2261

6 files changed, 53 insertions, 6 deletions

diff --git a/examples/dextrose2-xo1.5.ini b/examples/dextrose2-xo1.5.ini
index 018d658..a514e3a 100644
--- a/examples/dextrose2-xo1.5.ini
+++ b/examples/dextrose2-xo1.5.ini
@@ -137,7 +137,11 @@ activities=
 	org.laptop.Memorize,
 	org.laptop.Oficina,
 	org.laptop.Pippy,
-	org.laptop.RecordActivity,
+
+;disabled because we're temporarily using record-87 having the ui-fixes
+;rebased over mainline/record-86
+;	org.laptop.RecordActivity,
+
 	org.laptop.StopWatchActivity,
 	org.laptop.TamTamEdit,
 	org.laptop.TamTamJam,
@@ -201,6 +205,10 @@ url_14=http://dev.laptop.org/~sj/WorldDigitalLibrary-5.xol
 ; m_anish's majestic Browse with tabs!
 url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
 
+; record-87: record-79's ui fixes rebased over mainline/record-86
+url_51=http://people.sugarlabs.org/~anish/Record-87.xo
+
+
 [powerd]
 ; should work well on the XO-1.5
 enable_idle_suspend=1
diff --git a/examples/dextrose2-xo1.ini b/examples/dextrose2-xo1.ini
index ebff1f9..ba338db 100644
--- a/examples/dextrose2-xo1.ini
+++ b/examples/dextrose2-xo1.ini
@@ -131,7 +131,11 @@ activities=
 	org.laptop.Memorize,
 	org.laptop.Oficina,
 	org.laptop.Pippy,
-	org.laptop.RecordActivity,
+
+;disabled because we're temporarily using record-87 having the ui-fixes
+;rebased over mainline/record-86
+;	org.laptop.RecordActivity,
+
 	org.laptop.StopWatchActivity,
 	org.laptop.TamTamEdit,
 	org.laptop.TamTamJam,
@@ -184,6 +188,9 @@ url_13=http://wiki.laptop.org/images/f/fe/WikisliceChemistry-en-8.xol
 ; m_anish's majestic Browse with tabs!
 url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
 
+; record-87: record-79's ui fixes rebased over mainline/record-86
+url_51=http://people.sugarlabs.org/~anish/Record-87.xo
+
 [powerd]
 ; idle-suspend on XO-1 is not fully reliable. sometimes there are problems
 ; with wifi after resume, and the resume delay is a little too noticable.
diff --git a/examples/f11-0.88-xo1-py-nognome.ini b/examples/f11-0.88-xo1-py-nognome.ini
index 90d43cb..5a04616 100644
--- a/examples/f11-0.88-xo1-py-nognome.ini
+++ b/examples/f11-0.88-xo1-py-nognome.ini
@@ -124,7 +124,11 @@ activities=
 	org.laptop.ImageViewerActivity,
 	org.laptop.Memorize,
 	org.laptop.Oficina,
-	org.laptop.RecordActivity,
+
+;disabled because we're temporarily using record-87 having the ui-fixes
+;rebased over mainline/record-86
+;	org.laptop.RecordActivity,
+
 	org.laptop.TamTamMini,
 	org.laptop.Terminal,
 	org.laptop.TurtleArtActivity,
@@ -149,6 +153,10 @@ url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
 url_51=http://people.sugarlabs.org/~bernie/sugar/activities/gcompris-15.xo
 url_52=http://people.sugarlabs.org/~bernie/sugar/activities/tux_paint-5.xo
 
+; record-87: record-79's ui fixes rebased over mainline/record-86
+url_53=http://people.sugarlabs.org/~anish/Record-87.xo
+
+
 [powerd]
 ; idle-suspend on XO-1 is not fully reliable. sometimes there are problems
 ; with wifi after resume, and the resume delay is a little too noticable.
diff --git a/examples/f11-0.88-xo1-py.ini b/examples/f11-0.88-xo1-py.ini
index 671fa7f..eb6bf9d 100644
--- a/examples/f11-0.88-xo1-py.ini
+++ b/examples/f11-0.88-xo1-py.ini
@@ -131,7 +131,11 @@ activities=
 	org.laptop.Memorize,
 	org.laptop.Oficina,
 	org.laptop.Pippy,
-	org.laptop.RecordActivity,
+
+;disabled because we're temporarily using record-87 having the ui-fixes
+;rebased over mainline/record-86
+;	org.laptop.RecordActivity,
+
 	org.laptop.StopWatchActivity,
 	org.laptop.TamTamEdit,
 	org.laptop.TamTamJam,
@@ -187,6 +191,10 @@ url_13=http://wiki.laptop.org/images/f/fe/WikisliceChemistry-en-8.xol
 ; m_anish's majestic Browse with tabs!
 url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
 
+; record-87: record-79's ui fixes rebased over mainline/record-86
+url_51=http://people.sugarlabs.org/~anish/Record-87.xo
+
+
 [powerd]
 ; idle-suspend on XO-1 is not fully reliable. sometimes there are problems
 ; with wifi after resume, and the resume delay is a little too noticable.
diff --git a/examples/f11-0.88-xo1.5-py-nognome.ini b/examples/f11-0.88-xo1.5-py-nognome.ini
index b1f5cc5..1669fac 100644
--- a/examples/f11-0.88-xo1.5-py-nognome.ini
+++ b/examples/f11-0.88-xo1.5-py-nognome.ini
@@ -131,7 +131,11 @@ activities=
 	org.laptop.ImageViewerActivity,
 	org.laptop.Memorize,
 	org.laptop.Oficina,
-	org.laptop.RecordActivity,
+
+;disabled because we're temporarily using record-87 having the ui-fixes
+;rebased over mainline/record-86
+;	org.laptop.RecordActivity,
+
 	org.laptop.TamTamMini,
 	org.laptop.Terminal,
 	org.laptop.TurtleArtActivity,
@@ -156,6 +160,10 @@ url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
 url_51=http://people.sugarlabs.org/~bernie/sugar/activities/gcompris-15.xo
 url_52=http://people.sugarlabs.org/~bernie/sugar/activities/tux_paint-5.xo
 
+; record-87: record-79's ui fixes rebased over mainline/record-86
+url_53=http://people.sugarlabs.org/~anish/Record-87.xo
+
+
 [powerd]
 ; should work well on the XO-1.5,
 ; but disabled by default because not sufficiently tested
diff --git a/examples/f11-0.88-xo1.5-py.ini b/examples/f11-0.88-xo1.5-py.ini
index f81b554..fb07c4f 100644
--- a/examples/f11-0.88-xo1.5-py.ini
+++ b/examples/f11-0.88-xo1.5-py.ini
@@ -138,7 +138,11 @@ activities=
 	org.laptop.Memorize,
 	org.laptop.Oficina,
 	org.laptop.Pippy,
-	org.laptop.RecordActivity,
+
+;disabled because we're temporarily using record-87 having the ui-fixes
+;rebased over mainline/record-86
+;	org.laptop.RecordActivity,
+
 	org.laptop.StopWatchActivity,
 	org.laptop.TamTamEdit,
 	org.laptop.TamTamJam,
@@ -204,6 +208,10 @@ url_50=http://people.sugarlabs.org/~anish/Browse-115.xo
 url_51=http://people.sugarlabs.org/~bernie/sugar/activities/gcompris-15.xo
 url_52=http://people.sugarlabs.org/~bernie/sugar/activities/tux_paint-5.xo
 
+; record-87: record-79's ui fixes rebased over mainline/record-86
+url_53=http://people.sugarlabs.org/~anish/Record-87.xo
+
+
 [powerd]
 ; should work well on the XO-1.5, but disabled just in case
 enable_idle_suspend=0