| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
Acked-By: Simon Schampijer <simon@laptop.org>
Reviewed-By: Sascha Silbe <silbe@activitycentral.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Setting the 'autoconnect' property for the connection
will let NM do the reconnection when the device is up. If
the Sugar Ad-hoc network is around it will automatically
connect to it. The connection is not stored after logging
out of Sugar.
The autoconnect functionality inside Sugar is still needed
for the cases when we log into Sugar, after a timeout we
will connect to an exisiting Ad-hoc network or will default
to the Sugar Ad-hoc network on channel 1. I increased the
timeout to 60 seconds because during testing I found to
get more reliable results like that.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
|
|
|
|
|
| |
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
|
| |
|
| |
|
|\ |
|
| |
| |
| |
| |
| | |
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Acked-by: Simon Schampijer <simon@laptop.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
By default, Sugar's gconf schema configures a UTC timezone, and this
means that sugar-session unconditionally adjusts the environment so that
a UTC timezone is used.
This overrides any system-wide timezone specified by /etc/localtime.
Test case: set /etc/localtime to Asia/Taipei, start sugar, open terminal,
run "date", observe that it shows GMT time.
Drop the text value from the default gconf schema. This allows the
systemwide timezone to be used as a default. Sugar users can still make
their own choice (overriding the systemwide default) in the control panel.
Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The new code will store the metadata and preview in a hidden
folder like in 0.82. The folder will be named .Sugar_metadata.
There will be two files per entry, one for the metadata named
filename.metadata and one for the preview (if exists)
named filename.preview. The data files will be stored in the
root folder of the device. User experience: When the user views
the content of a mass storage device Journal entries that have
been copied to the device will be shown in the color of
the creator (same behavior as with 0.82).
Note: In 0.84 entries that do not contain a data file can
not be copied to a storage device anymore
(this was possible in 0.82), an alert is displayed to the
learner in those cases. This change has been independent
of these patches.
The code is written defensive. If the metadata/preview is
corrupted or has been removed it will be skipped, so the
deletion of a data file on the device is handled gracefully.
The learner has now the options to: backup the Journal
entry to a storage device and copy it back to his own Journal
later, share his entry with another learner over a storage
device and use the file on a non Sugar machine
(showing a picture to your friend on his computer).
more info: http://wiki.sugarlabs.org/go/Features/Journal_Entry_Sharing
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>
|
|/
|
|
|
|
|
|
|
|
| |
Converts the entries to the new format [1] when the device is plugged
into the machine.
[1] http://wiki.sugarlabs.org/go/Features/Journal_Entry_Sharing
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
HAL is deprecated, UPower is the designated replacement w.r.t. power
supplies. As a bonus the time displayed is now correct (calculated at
run-time by UPower, self-adjusting to changes in power consumption).
Tested on XO-1.5 running Debian Squeeze with stock UPower (0.9.5-5) and a
2.6.35 OLPC kernel.
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Acked-by: Simon Schampijer <simon@laptop.org>
|
|/
|
|
|
|
|
|
| |
Move the code that handles the list given by the view
to a separate function to make it clearer.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
HAL [1] is dead [2], ConsoleKit [3] now handles shutdown / reboot.
Tested on XO-1.5 running Debian Squeeze with consolekit 0.4.1-4.
[1] http://www.freedesktop.org/wiki/Software/hal
[2] http://lists.freedesktop.org/archives/hal/2008-May/011560.html
[3] http://www.freedesktop.org/wiki/Software/ConsoleKit
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Tested-By: Simon Schampijer <simon@laptop.org>
Acked-By: Simon Schampijer <simon@laptop.org>
|
|
|
|
|
|
|
|
| |
Add a MIME type definition for Journal Entry Bundles (JEBs) so they get
detected properly if encountered outside of the data store.
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Acked-by: Simon Schampijer <simon@laptop.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Now activities have a stack of windows (Activity._windows). The
lowest still-valid window in the stack is considered the main window.
When a window is closed, the shell finds what activity had that window,
tells it to remove it from its stack. If that was the last window
in the activities' stack, the activity is marked as closed.
With this patch, activities can switch from one window to another
safely, without sugar shell losing track of them. Activities based
on AdobeAIR have been seen to switch windows (perhaps when they navigate
from one SWF to another).
This replaces the one-window = one-activity model, where the moment
an activity closed one window (perhaps one of many) it was considered
closed by the shell.
Signed-off-by: Martin Langhoff <martin@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Reports from the field indicate that users accidently left-click the Speaker
icon and don't realise it got muted. By popping up the palette we enable them
to explicitly choose the mute action without instead of surprising them by
automatically executing one of the secondary actions (there is no primary
action).
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Reviewed-by: James Cameron <quozl@laptop.org>
|
|
|
|
|
|
|
|
| |
Since Python doesn't support pgettext, we need to teach xgettext to recognise
it.
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Acked-by: Simon Schampijer <simon@laptop.org>
|
|
|
|
|
|
|
|
|
|
| |
Most of it was already removed by the sugar-presence-service / Telepathy
rewrite.
Signed-off-by: Bernie Innocenti <bernie@codewiz.org>
[rebased on mainline/master, adjusted description]
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Reviewed-by: Sascha Silbe <silbe@activitycentral.com>
|
|
|
|
|
| |
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Reviewed-by: Aleksey Lim <alsroot@activitycentral.org>
|