| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Implies a change in the translation strings.
Signed-off-by: Daniel Francis <francis@sugarlabs.org>
|
|
|
|
| |
Signed-off-by: Daniel Francis <francis@sugarlabs.org>
|
|
|
|
| |
Signed-off-by: Daniel Francis <francis@sugarlabs.org>
|
|
|
|
| |
Signed-off-by: Daniel Francis <francis@sugarlabs.org>
|
|
|
|
| |
Signed-off-by: Daniel Francis <francis@sugarlabs.org>
|
|
|
|
|
|
|
|
|
|
|
| |
client.get_list() is not introspectable, as the elements in the list returned do
not have a fixed type. However, we can use the more generic .get() and the
GConfValue methods to read the list.
Patch by Daniel: http://dev.laptop.org/git/users/dsd/sugar/commit/?h=gtk3port&id=5ebdc335a6ed33aa019093db27b25a874221fe4d
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Manuel Quiñones <manuq@laptop.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is a constructor to construct a GFile with a given
path [1] instead of passing the patch to the constructor
as in the static bindings.
For monitoring the directory [3] we pass no GFileMonitorFlags [4]
and mark it non cancellable.
A test program can be found at [5].
[1] http://developer.gnome.org/gio/unstable/GFile.html#g-file-new-for-path
[2] http://www.pygtk.org/docs/pygobject/class-giofile.html#constructor-giofile
[3] http://developer.gnome.org/gio/unstable/GFile.html#g-file-monitor-directory
[4] http://developer.gnome.org/gio/unstable/GFile.html#GFileMonitorFlags-enum
[5] http://dev.laptop.org/~erikos/shell_port/tests/test_gio_watch.py
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Run sugar-convert.sh [1] for automatic conversion from sugar.* imports to
sugar3.* imports. This is only on a best-effort basis; the code will
be in a broken state after this patch and need to be fixed manually.
The purpose of committing the intermediate, non-working output is to make it
reproducible. It's impractical to manually review the changes.
[1] http://dev.laptop.org/~manuq/sugar-convert.sh
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Manuel Quiñones <manuq@laptop.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Run pygi-convert.sh for automatic conversion from GTK+ 2 to GTK+ 3 and
pygobject+gobject-introspection. This is only on a best-effort basis;
the code will be in a broken state after this patch and need to be
fixed manually.
The purpose of committing the intermediate, non-working output is to make it
reproducible. It's impractical to manually review the changes.
The exact version used was 2d8f48f4ff56bb75985136452b50b75895258608 from the
main pygobject repository [1].
[1] git://git.gnome.org/pygobject
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Manuel Quiñones <manuq@laptop.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
49232e55 introduced a typo that caused a bundle to be considered installed
even if it contained an older version than what was actually installed. This
is turn triggered the "upgrade" logic in jarabe.journal.misc.resume().
The result was that activities got downgraded without asking the user for
confirmation.
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Acked-by: Simon Schampijer <simon@laptop.org>
|
|
|
|
|
|
| |
Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
Acked-By: Simon Schampijer <simon@laptop.org>
Reviewed-By: Sascha Silbe <silbe@activitycentral.com>
|
|
|
|
|
| |
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Reviewed-by: Aleksey Lim <alsroot@activitycentral.org>
|
|
|
|
|
|
|
|
| |
I am reverting this commit.
Revert "restore sugar-launch by bundle id substring, fixes #897"
This reverts commit 4a3416b9acdfdd533ee2d69633f1383476db5e71.
|
|
|
|
|
|
| |
Reviewed-by: James Cameron <quozl@laptop.org>
Reviewed-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
|
|
|
|
|
|
|
|
|
| |
logging.exception() handles exceptions nicely for us, no need to explicitly
use traceback.
Reviewed-by: James Cameron <quozl@laptop.org>
Reviewed-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
|
|
|
|
|
|
|
|
| |
has_key() has been deprecated for quite some time now.
Reviewed-by: James Cameron <quozl@laptop.org>
Reviewed-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
|
|
|
|
|
|
|
|
| |
This is important for Sugar because the XO has a small screen where long lines
would make the code hard to understand (because you need to constantly scroll horizontally).
Reviewed-by: James Cameron <quozl@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
|
|
|
|
|
|
| |
Reviewed-by: James Cameron <quozl@laptop.org>
Reviewed-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
|
|
|
|
|
|
| |
Reviewed-by: James Cameron <quozl@laptop.org>
Reviewed-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This only touches the globals that were flagged by pep8 due to white space
issues or contain "instance" in their name (singleton pattern).
I've also left the sunflower layout variables alone. AFAICT this layout is
currently unused and should be removed instead (or factored out like the snow
flake layout and reenabled).
Reviewed-by: James Cameron <quozl@laptop.org>
Reviewed-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
|
|
|
|
|
|
| |
- the activities list view is changed to use a string for the version
- the comparisons in the bundleregistry have changed to use the new
numbering scheme
|
|
|
|
|
|
|
|
|
|
| |
Activity can be downgraded on the availability of an older .xo version of an
activity. An alert pops up when trying to install an older .xo file of an
activity, which asks the user to make a selection on whether to move to an
older activity version or not.
Co-authored-by: Shanjit Singh Jajmann <shanjit@seeta.in>
Co-authored-by: Anubhav Aggarwal <anubhav@seeta.in>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Activities deletion causes troubles during classes. Teachers from
Paraguay and Uruguay asked for a mechanism to protect activities
from being easily deleted.
This patch provides a mechanism that uses a gconf value to determine
which activities will not contain the erase option at the list view
palette.
The gconf value contains a list of activities bundle indentifiers.
|
|
|
|
|
|
|
|
| |
Profile data should be deleted _only_ when the
user explicitly erases the activity from the
activities list.
Signed-off-by: Martin Abente <mabente@paraguayeduca.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
sugar-launch uses GetBundlePath which calls bundleregistry.get_bundle().
In this patch, the get_bundle() method is changed to retain as much of
the original API as possible, yet in the situation where it might return
None it will now return a bundle if there is only one bundle that
matches the search string.
http://bugs.sugarlabs.org/ticket/897
http://dev.laptop.org/ticket/9189
Patch tested on Sugar 0.84.10 on OLPC XO-1.5 build os108.
Test case:
import jarabe.model.bundleregistry
registry = jarabe.model.bundleregistry.BundleRegistry()
tests = ['org.laptop.Terminal', 'Terminal', 'terminal', 'e', 'asdqweas']
for x in tests:
y = registry.get_bundle(x)
if y is None:
z = 'None'
else:
z = y.get_bundle_id()
print x, z
Output before patch:
org.laptop.Terminal org.laptop.Terminal
Terminal None
terminal None
e None
asdqweas None
Output after patch:
org.laptop.Terminal org.laptop.Terminal
Terminal org.laptop.Terminal
terminal org.laptop.Terminal
e None
asdqweas None
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
This fixes a problem where "Show in Journal" from a Browse download
was broken. This is because the JEB installation code would extract the
content from the bundle entry, install it as a new datastore entry,
and then delete the bundle entry.
This is fixed by making the journal entry from the bundle take over
the datastore entry that belonged to the bundle.
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit ee4535c98ae74347e7072909d49dcf8a5e16ca7b.
cjson has a big bug dealing with slashes, this is a significant
long-term bug and upstream has not been responsive other than
acknowledging it. This bug breaks journal entry bundles.
http://dev.sugarlabs.org/ticket/1553
Thanks to Martin Langhoff for identifying and researching this issue
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
regression from #235
|
| |
|