Commit Graph

74 Commits

Author SHA1 Message Date
James Cameron
495eed8737 Prepend instead of append to path
When an activity is launched, an import should first search the activity
bundle source rather than /usr/bin

Fixes the need to change activity sources every time a system package
conflicts with an import.

May impact any activity that relies on a system package being in search
path before the bundle source.  Forty activities were tested, and none
relied on this.
2017-03-27 19:07:37 +11:00
James Cameron
4b6d8751b3 sugar-activity: typo 2016-10-08 11:06:57 +11:00
Sebastian Silva
a462f14c55 Properly make a random activity_id outside Sugar. 2016-05-17 03:50:09 -05:00
Sebastian Silva
c5fa4dfd59 Fix regression for GTK2 activities caused by 2f2b2d2
The issue was caused by importing from activityfactory which caused GObject to be imported. This conflicts with GTK2. (Reported by James Cameron)
The idea is that we should create the sugar profile's activity root if it doesn't exist yet, when running outside Sugar.
2016-05-16 23:36:01 -05:00
Sebastian Silva
2f2b2d20d8 Allow to run activities without Sugar shell.
- Handle lack of GSettings gracefully.
- Still requires sugar-datastore.
- Supports avoiding X11 docks/panels.
- Provides icons for Activity windows.

Try it outside Sugar. Go to an Activity directory and run 'sugar-activity'.
Tested it with Terminal, Finance, Write, Browse, Memorize under XFCE4.
Tested in Gnome under OLPC-OS.
Also works from Sugar Terminal Activity.
Does not affect regular Sugar operation.

This is patch v.2 -
    Addresses most concerns:
    - Removed commented code, sorry.
    - Changed code to use profile.get_nickname and get_color where possible.

    Couldn't the launcher just pass this info?
    Maybe the launcher could set the activity root as well?
        - It is intended to be usable from the command line also.
    Should put sugar version in the environment
        - It is intended to work even without Sugar Shell installed.
    Why don't we always set the icon?
        - On XO it might use some memory. I was concerned to degrade
        performance.
    Also, imports should be at the top of the file?
        - Also a concern about performance on XO.
        This way it is only loaded in this use case.
        Maybe it is insignificant -moved as requested.
    It would be nice if the changes to the POT for sugar-toolkit-gtk3
    could be incorporated in this pull request, please.
        - There were no changes to POT files as part of this patch. Maybe
        it is worth translating low level command line tools, not sure.
    Suggest packaged activities might also provide .desktop files.
        - Intriguing but not sure within scope of this patch. You mean generate
        a .desktop file automatically as an option? Sounds nice!
    Suggest sugar-activity might also accept path to unpacked bundle.
        - Implemented!
2016-04-21 03:10:30 -05:00
James Cameron
00c541af4f sugar-activity-web: remove bash specific code 2015-05-29 12:17:41 +10:00
Gonzalo Odiard
f157b1148e Avoid breaking activity startup by dbus timeout on sigle instance - Fixes #4773
This problem only happen in activities configured with the option -s
in the activity.info "exec" field, and the objective is use a single process,
even when starting more than one instance. If the process do not reply,
start a new process, instead of show a error.

Signed-off-by: Gonzalo Odiard <godiard@sugarlabs.org>
2014-05-21 14:40:51 -04:00
Gonzalo Odiard
43a4611d75 Pep8 and pyflakes fixes to sugar-activity 2014-05-20 17:16:20 -04:00
Gonzalo Odiard
f52b4e1a96 Make webactivity compatible with webkit1
If a env variable SUGAR_USE_WEBKIT1 exists,
uses a different module to start the activity using a local webserver,
borrowed from wikipedia activity.
When use webkit1 the web inspector is not enabled, because do not work.

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
2013-12-13 10:56:21 -03:00
Daniel Narvaez
6fdf5f208a Use python2 shebang
Some distributions have switched to python3 as default and our code
breaks because it's python2 specific. Follow the PEP 394
recommendation.
2013-09-30 11:55:14 -03:00
Daniel Narvaez
6523ba1481 Bind the new toolkit domain 2013-09-11 16:04:13 +02:00
Daniel Narvaez
b83ddaefaf Revert "Fix translations domains to point to new toolkit"
This reverts commit abe0de3ef8.
2013-09-11 15:59:34 +02:00
Daniel Narvaez
abe0de3ef8 Fix translations domains to point to new toolkit 2013-09-11 15:27:46 +02:00
Daniel Narvaez
9717e5954b Fix translations in non standard prefix
This drops a lot of code at the same time. The code in
__init__ was:

* Using a SUGAR_PREFIX environment variable that is not
defined anywhere
* Hardcoding prefix to /usr
* Setting up the sugar-base domain which doesn't exist anymore

The i18n module code was overcomplex because it was thought
for language packs which we don't support anymore, it was
not handling correctly locales with a country prefix, it
was hard coding the python prefix and it was not sorting
the directories as it intended too anyway.

The logic is very simple now. Use the locale directory in
the same prefix sugar-toolkit-gtk3 was installed, unless
SUGAR_LOCALEDIR is defined (for self contained bundles).
2013-09-10 22:55:11 +02:00
Daniel Drake
e01837f8be Drop use of deprecated dbus.glib
When writing Python apps that will use asynchronous DBus calls and
signals, python-dbus must be initialised with the appropriate main
loop.

sugar currently does this by importing the datastore module from
sugar-toolkit-gtk3, and the datastore module uses the deprecated
and confusing dbus.glib module (which automatically and non-obviously
sets the default GLib main context as the DBus mainloop).

Eliminate the dbus.glib usage from sugar-toolkit-gtk3 as part
of the effort to make sugar initialised the DBus mainloop in a
more explicit and non-deprecated fashion.
2013-09-05 17:47:52 +02:00
Daniel Narvaez
a1b73ff527 Rename HTML to web 2013-06-10 15:46:54 +02:00
Daniel Narvaez
d4019684a3 Add exec script to build pure html activities
An hello world activity using the script
http://git.sugarlabs.org/hello-world/mainline/trees/html
2013-04-23 16:05:20 +02:00
Simon Schampijer
dcbdcd77fe i18n get_locale_path: handle the case when the default locale is not set, SL #4450
If the default locale is not set (see SL #4450 for a use case), get_locale_path
does now return None so that the sugar-activity script can handle that case
cleanly.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-by: Daniel Drake <dsd@laptop.org>
2013-03-08 10:29:17 +01:00
Gonzalo Odiard
5fdad9481b Set default python encoding to utf-8
As spoted by Daniel Narvaez in [1], pygi does not set the default encoding
anymore as the old GTK+ did. This change does break activities ported
to GTK+3.

The change in GTK+ has been discussed upstream here [2].

A better solution will be implemented when we port to Python 3,
when we will be able to use real unicode strings.

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>

[1] http://lists.sugarlabs.org/archive/sugar-devel/2012-August/038993.html
[2] https://bugzilla.gnome.org/show_bug.cgi?id=681915
2012-09-26 13:29:07 +02:00
Simon Schampijer
6330204e91 Move the translation initialisation to an earlier stage, SL #3654
Must be done early, some activities set translations globally. Remove
the support for the langpackdir.

Signed-off-by: Simon Schampijer <simon@laptop.org>
2012-06-05 23:45:26 +02:00
Simon Schampijer
b03a483854 Use the gtk3 toolkit in the sugar-activity
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Daniel Drake <dsd@laptop.org>
2011-12-20 19:19:26 +01:00
Daniel Drake
4e137f6e4f sugar-activity: import and make independent of sugar-toolkit GTK versions
As we move to adding support for a second UI toolkit (GTK+ 3.x),
the sugar-activity binary used by all activities must become
backend-toolkit-independent. It would be wasteful to have two backend
toolkits loaded in memory, and in the GTK2/GTK3 case, it is impossible
(importing both results in an instant crash).

To achieve this, we split the existing sugar-toolkit activity/main.py:main()
functionality into two parts, moving it into the sugar-activity binary and
the Activity class as follows:
 1. All toolkit-specific stuff is moved into the Activity class (i.e.
   everything that interacts with GTK)
 2. Everything that can be reasonably/easily moved into the Activity class
   is also moved.
 3. What remains is the stuff that is inherently involved with the
   construction of the Activity object, not related to UI toolkits. This
   is moved into the sugar-activity binary.

main.py is then removed from sugar-toolkit, and sugar-activity is moved
from sugar to sugar-toolkit-gtk3 in order to keep toolkit-related code
with the toolkit itself.

With this work done, the one remaining question is how to invoke the main
loop. An optional run_main_loop() method is added to the activity class,
for GTK2 this will run the GTK2 main loop, for GTK3 the GTK3 main loop will
be run, etc.

Signed-off-by: Daniel Drake <dsd@laptop.org>
2011-12-13 17:35:30 -03:00
Marco Pesenti Gritti
488402df7d Split sugar-toolkit out of sugar shell. 2008-02-06 10:20:33 +01:00
Marco Pesenti Gritti
44efc2a131 Complete paths cleanup and remove SUGAR_PREFIX and
SUGAR_PATH environment variables.
2008-02-05 01:21:55 +01:00
Marco Pesenti Gritti
aca3ae6c88 Remove get_service_path and use the usual wrapper script approach. 2008-02-05 01:02:33 +01:00
Marco Pesenti Gritti
dbe42ac6d9 Make the shell scripts just a tiny wrapper which setup
the python path and run main().
2008-02-04 20:36:09 +01:00
Marco Pesenti Gritti
1c361ea5dd Add a config module into the shell holding path informations.
Get rid of env.get_locale_path()
2008-02-04 19:16:46 +01:00
Marco Pesenti Gritti
33ae2dc548 Remove get_bin_path usage. 2008-02-04 19:04:22 +01:00
Marco Pesenti Gritti
e85a07e2d2 Work around for numpy/gtk issue with turkish locale. Fix #5559. 2008-01-10 18:33:50 +01:00
Tomeu Vizoso
b7e0ccbf81 #5512 import the activity module later. 2007-12-19 20:03:25 +01:00
Marco Pesenti Gritti
6046c8ed46 Reap only activity processes. Fix #5044 2007-11-28 16:10:27 +01:00
Marco Pesenti Gritti
0aa31147db Strip out /usr/bin/env from the interpreter cmd,
it's apparently confusing gdb.
2007-11-13 14:19:07 +01:00
Marco Pesenti Gritti
4c66eec49b Completely get rid of sound in the shell to make
sure it's not causing problems.
2007-11-13 01:50:20 +01:00
Marco Pesenti Gritti
cc9e561153 Reap childs rather than ignoring them. 2007-11-02 17:05:54 +01:00
Marco Pesenti Gritti
d445bc086d Free the sound device when the startup when the sound has been played.
Factored out to a separate sound module from cjb patch.
2007-11-02 11:04:41 +01:00
Simon Schampijer
70079de872 refinements in output of sugar-control 2007-11-01 12:37:43 +01:00
Simon Schampijer
14ffdc1d03 sugar-control: fixed some imports, cleaned some strings 2007-10-31 11:32:54 +01:00
Simon Schampijer
38b87ad7cd sugar-control: add env import 2007-10-31 10:36:38 +01:00
Marco Pesenti Gritti
b72f00e30b Integrate control panel in the build so that I can actually
distcheck.
2007-10-31 00:05:16 +01:00
Marco Pesenti Gritti
880f1c637d Parse arguments rather than forking out a shell 2007-10-23 18:22:59 +02:00
Marco Pesenti Gritti
0daccca71f Fake backup script 2007-10-22 22:03:39 +02:00
Tomeu Vizoso
5084ecf4f4 Add the posibility to launch activitis in gdb to sugar-lauch. 2007-10-18 13:32:12 +02:00
Marco Pesenti Gritti
cb0cedbc40 Do not use prgname for the bundle id because xulrunner
is messing with it. Some activity launch fixes.
2007-10-16 14:29:38 +02:00
Marco Pesenti Gritti
68ff71a0cb Split part of the sugar library to sugar-base 2007-10-15 15:39:07 +02:00
Marco Pesenti Gritti
a0bd80bb4e Snapshot 6c7c6a503b. 2007-10-09 23:46:21 +02:00
Marco Pesenti Gritti
b44a2916ba Rework sugar.logger and make activities just
redirect their output to a log.
2007-10-09 18:58:39 +02:00
Marco Pesenti Gritti
7c59d10a06 Actually remove the factory 2007-10-09 16:24:38 +02:00
Marco Pesenti Gritti
c2982f2774 Implement a sugar-launch command. Works like the old sugar-activity
but should deal fine with native activities too.
2007-10-09 15:25:24 +02:00
Marco Pesenti Gritti
6073a396b3 Rename activity service_name to bundle_id 2007-10-09 13:15:06 +02:00
Marco Pesenti Gritti
6ebe910e93 In preparation of enabling rainbow by default, remove
the factory service from the public API. The Exec field
will now launch an activity instance.
Add a -s argument to sugar-activity to enable the single
process mode for activities that really need it.
2007-10-08 14:56:12 +02:00