Commit Graph

843 Commits

Author SHA1 Message Date
Daniel Drake
147d80aa78 ActivityFactory: don't run which to check for rainbow
One less thing to do in the common activity startup path.
Also, which might not be available.
2013-07-13 11:05:41 -06:00
Manuel Quiñones
0b47dd37b1 Merge branch 'objectchooser_preview-try2' of https://github.com/godiard/sugar-toolkit-gtk3 into godiard-objectchooser_preview-try2 2013-07-08 17:17:22 -03:00
Gonzalo Odiard
3e6507af6e Add a option to the objectchooser to show the object preview
Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
2013-07-08 15:52:18 -03:00
Gonzalo Odiard
8e975bd5c9 Add a method to create a Pixbuf with the preview in the metadata
This code was moved from sugar expandedentry.py to be available to use
in other places. Some activities like Portfolio or JournalShare
have this code copied.

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
2013-07-08 15:51:27 -03:00
Daniel Drake
670fc44b1a Icon: handle image loading errors
If the icon can't be found, fall back on showing a generic icon.

Useful when activity/content bundles specify a bad icon, which is
unfortunately true for most content bundles in current existance
(because the icon field was previously unused).
2013-07-05 01:13:52 +02:00
Daniel Drake
f46ac7ba6a ContentBundle cleanups
Share get_installation_time() between all bundle types so that it works
with content bundles.

Add get_tags() stub, this is called by Sugar.

Remove unused fields: l10n, category, subcategory, etc.

We remove support for running OLPC's content bundle indexer.
This is assumed to go away now that Sugar will support content bundles
as first-class objects.

Some minor behavioural fixes and cleanups.

This now implements http://wiki.sugarlabs.org/go/Content_bundles
and when care is taken to include all the fields required by old
Sugar versions, there is no change in compatibility of existing or
new content bundles.

Required for http://wiki.sugarlabs.org/go/Features/Content_support
2013-07-05 01:13:52 +02:00
Daniel Narvaez
363eef5293 Fix pep8 2013-07-05 00:57:03 +02:00
surajgillespie
8c736d3870 Pass activity name to the webactivity 2013-07-05 00:53:23 +02:00
Manuel Quiñones
2643a0b25c Merge branch 'at' of https://github.com/dnarvaez/sugar-toolkit-gtk3 into dnarvaez-at 2013-07-04 19:20:46 -03:00
Daniel Drake
efaf9f9b2f Avoid use of uuid module
Upon import of uuid, that module uses ctypes.util to find libuuid/libc,
which involves forking a shell process which then forks and runs ldconfig.

ldconfig performs a whole bunch of disk accesses. This is a slowdown.

uuid.getnode() is also documented to be slow. Lets avoid using it in
the activity launch path; we don't need such a high degree of
randomness.

This makes activities launch 1-2 seconds faster on XO-1.
2013-07-04 11:43:54 -06:00
Daniel Narvaez
6d2b97daec Fix pep8 errors
pep8 1.6.4 detects more issues
2013-07-04 19:00:57 +02:00
Daniel Drake
778b10f8d4 Allow override of user library path
This allows for override of ~/Library the same way that can be done
for ~/Activities. Useful for automated testing.
2013-07-02 17:46:33 +02:00
Daniel Drake
be91f84a4b Avoid auto-import of bundle helpers (#4527)
The new bundle helpers were being auto-loaded with sugar3.bundle due
to their placement in __init__.py. This was causing Gi to be imported,
breaking GTK2 activity launches.

Move the helpers to a dedicated module.
2013-06-29 09:17:26 -06:00
Daniel Narvaez
8fff409046 Add missing headers
Fixes distcheck
2013-06-27 16:11:23 +02:00
Daniel Narvaez
9778f1d35f Don't set AT_SPI_CLIENT
This is not necessary anymore with latest at-spi2-atk
(See commit 683739dea15d7c02c217a404d8c5d9d7af076a57)
2013-06-26 23:00:58 +02:00
Daniel Drake
12476caa12 Improve bundle API for bundleregistry changes
The bundle API is a bit confusing and inconsistent. Fix up the
ActivityBundle and ContentBundle classes to be more consistent and to
work with the ongoing improvements being made in bundleregistry.
2013-06-24 22:47:13 +02:00
Daniel Drake
f4c1bd152a Add bundle instantiation helpers
Add some helper functions for use by upcoming changes in the Sugar shell.
2013-06-24 22:47:13 +02:00
Gonzalo Odiard
ad3c163023 Fix ObjectChooser backwards compatibility
The last change brak compatibility with the use in activities
without set the filter_type parameter, because None is not
a allowed value in the dbus call.

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
2013-06-24 02:14:57 -03:00
Daniel Narvaez
f54229efd2 Move setting AT_SPI_CLIENT to discover
It needs to be called as early as possible before unit tests
has a chance to import gtk.

Hopefully will fix random test failures we are seeing in buildbot.
2013-06-22 12:29:00 +02:00
Daniel Narvaez
6d319619f0 Factor out the discover logic to the test module
This avoids duplication in sugar and sugar-toolkit-gtk3
makefiles.
2013-06-22 12:28:56 +02:00
Gonzalo Odiard
da3786d2fb Add filter_type optative parameter to objectchooser
Constants are defined to select the different filter_type
values. A comment was added to document the use.

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
2013-06-20 17:42:19 -03:00
Daniel Narvaez
19bc2268d4 Log the UI tree on error
The dump method doesn't actually print anything, just
returns the tree as a string.
2013-06-19 19:20:44 +02:00
Daniel Narvaez
5bef5a82d2 Set the AT_SPI_CLIENT variable in the tests
This ensures the test itself is not recognized as a client
by the registry. I'm not sure how that happens since we are
not loading gtk, but it does. Not being a real gtk client with
a mainloop we wasn't answering dbus calls and causing the registry
to hang and fail.
2013-06-15 23:56:45 +02:00
Daniel Narvaez
4dc7b9e4a4 Don't set atspi timeout
Looking at the code I'm unconvinced this behaves as expected,
in certain cases at least. So reverting it for now to avoid
confusion.
2013-06-15 19:16:59 +02:00
Daniel Narvaez
521778636e Add a UIUnitTest class
To make it easier to write UI unit tests.
2013-06-15 19:15:32 +02:00
Daniel Narvaez
c86c582e19 Resync with the sugar-build implementation of tree.py
Development continued there for a while. Now I will remove it
and used the toolkit implementation instead.

Changes:

* Retry faster
* Handle GLib errors
* Don't always dump the tree
* Support master atspi api
2013-06-14 23:27:13 +02:00
William Orr
c736ffefcd pep8'd sugar3 2013-06-11 15:27:19 +02:00
William Orr
1252d95671 pep8'd sugar3.test 2013-06-11 15:25:07 +02:00
William Orr
69a7aa8f68 pep8'd sugar3.presence 2013-06-11 15:21:39 +02:00
William Orr
edbc8f53b3 pep8'd sugar3.graphics 2013-06-11 15:18:15 +02:00
William Orr
51f07bba81 pep8'd sugar3.dispatch 2013-06-11 15:13:19 +02:00
William Orr
220c9b68ef pep8'd sugar3.datastore 2013-06-11 15:11:58 +02:00
William Orr
9e4454a2ed pep8'd sugar3.bundle 2013-06-11 15:10:55 +02:00
William Orr
8a6c935dd0 pep8'd sugar3.activity 2013-06-11 15:06:49 +02:00
Walter Bender
3e5c37f3f8 Adding SugarExt for setting hidden attribute on FAT files
This extension is used by Sugar to set the HIDDEN attribute for
.Sugar-Metadata. By creating an extension, we avoid the need to add an
additional dependency (fatattr) to Sugar. The code is modeled after
fatattr, using an IOCTL call get and set FAT file attributes.

There is a corresponding patch for model.py in sugar/src/jarabe/journal
2013-06-10 15:46:54 +02:00
Daniel Narvaez
9396b09ee4 Send bundleId and objectId to javascript
Also use the json module to generate the environemnt
dictionary string. This takes care of a None objectId
cleanly.
2013-06-10 15:46:54 +02:00
Gonzalo Odiard
58bab9cf6a Do not use the translated summary to get the value from gettext in the bundle builder
This patch is a rebased push from pull request #31

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
2013-06-10 15:46:54 +02:00
Daniel Narvaez
1f5e39f3a8 Cleanup environment initialization
We are not setting up a single sugar.window.environment object.
2013-06-10 15:46:54 +02:00
Daniel Narvaez
a1b73ff527 Rename HTML to web 2013-06-10 15:46:54 +02:00
Daniel Narvaez
8e381f9e2f Make the inspector toggle work reliably 2013-06-10 15:46:54 +02:00
Daniel Narvaez
28fe9b757f Use a relative path in the activities url
It's just a bit cleaner.
2013-06-10 15:46:54 +02:00
Daniel Narvaez
a30af509c2 Rework HTMLActivity to not inherit from Activity
This will make the activity use less memory and start faster.
2013-06-10 15:46:54 +02:00
Daniel Narvaez
3aadcbcbf0 Move the websocket service to the shell
It's a first step to make html activities much lighter. It also
just makes a lot more sense to have them interact directly with
the system rather than proxying through the python activity.
2013-06-10 15:46:54 +02:00
Daniel Narvaez
b276f61da1 Use javascript to setup websocket port and key 2013-06-10 15:46:54 +02:00
Daniel Narvaez
3f908ef999 Deprecate and ignore the SUGAR_EMULATOR variable 2013-06-10 15:46:54 +02:00
Daniel Narvaez
2fcac13791 Toggle the inspector on and off with ctrl-shift-i 2013-06-10 15:46:53 +02:00
Daniel Narvaez
0abae0e7d0 Use a custom scheme for app content
To get the origin right.
2013-06-10 15:46:53 +02:00
William Orr
e649070aa2 Replaced deprecated GObject methods with GLib methods 2013-06-10 15:46:53 +02:00
William Orr
3a8760c9e4 Fixed crash in journal when mousing over activity icons 2013-06-10 15:46:53 +02:00
Simon Schampijer
ba1abd4a33 Palettes: remove comment about deprecated API
We make use of this API in the shell and in the toolkit itself
and never removed those deprecated calls. Let's leave it like
this for now and remove the comment.
2013-06-10 15:46:53 +02:00