Any activity fails to build with Python 3.9;
Traceback (most recent call last):
File "setup.py", line 19, in <module>
from sugar3.activity import bundlebuilder
File "sugar3/activity/bundlebuilder.py", line 44, in <module>
import xml.etree.cElementTree as ET
ModuleNotFoundError: No module named 'xml.etree.cElementTree'
See https://docs.python.org/3.9/whatsnew/3.9.html#removed
"The xml.etree.cElementTree module has been removed."
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1817644
Signed-off-by: Ibiam Chihurumnaya <ibiamchihurumnaya@gmail.com>
Signed-off-by: James Cameron <quozl@laptop.org>
On Ubuntu 20.04 with GTK 3.24.13, importing sugar3.activity.activity
fails with RuntimeError: could not create signal for _closing, preceeded
by an assertion is_valid_signal_name failed.
Cause is upstream 89f955d ("gsignal: Canonicalise signal names at
installation time ") which requires application signal names to not
start with a hyphen or underscore.
Remove the prefix from our signal name. The signal remains reserved and
private to the Activity class.
Activity install target used by downstream activity packaging did fail
with;
Traceback (most recent call last):
File "setup.py", line 21, in <module>
bundlebuilder.start()
File "/usr/lib/python3.7/dist-packages/sugar3/activity/bundlebuilder.py", line 633, in start
globals()['cmd_' + options.command](config, options)
File "/usr/lib/python3.7/dist-packages/sugar3/activity/bundlebuilder.py", line 513, in cmd_install
options.install_desktop_file)
File "/usr/lib/python3.7/dist-packages/sugar3/activity/bundlebuilder.py", line 290, in install
for f in self.get_files_in_git():
File "/usr/lib/python3.7/dist-packages/sugar3/activity/bundlebuilder.py", line 209, in get_files_in_git
stdout.strip('\n').split('\n')]
TypeError: a bytes-like object is required, not 'str'
Workaround was to hide .git directory.
Cause was subprocess pipe returning a bytes-like object in Python 3.
Regression introduced by incomplete ed46c21 ("Port to six").
Fixes https://github.com/sugarlabs/sugar-toolkit-gtk3/issues/426
Status zero is normal, so don't report it.
Also don't print the log_file object.
Changes log messages such as this;
Exited with status 0, pid 3765 data (<_io.TextIOWrapper name=13 mode='w'
encoding='UTF-8'>, '5312a7726254b3b0b9a15267c54600aec9db187e')
To this;
Normal successful completion, pid 3765 activity_id 5312a7726254b3b0b9a15267c54600aec9db187e
Defer iconify call to after the activity has been shown. Remember the
iconify call was requested, and make the call just prior to entering the
main loop.
On Ubuntu 18.04 with Metacity 3.32.0 the Journal does appear over the
Home View on Sugar start on a VM with two virtual CPUs, yet the previous
fix in Metacity (074af8f) is present. This is suggestive of a race
condition.
Tests with a minimal GTK reproducer shows order of three specific calls
is critical to success of iconify. The ordering and results are;
* iconify, maximize, show; not iconified,
* maximize, iconify, show; not iconified,
* iconify, show, maximize; not iconified,
* maximize, show, iconify; app with focus will flicker, iconified,
* show, maximize, iconify; app with focus may flicker, iconified,
* show, iconify, maximize; app with focus may flicker, iconified,
Sugar Toolkit combined with Journal uses the "maximize, iconify, show"
ordering. Using a Hello World activity with a call to iconify, the new
activity is not iconified.
When changed to "mazimise, show, iconify" ordering, there is no flicker
of the app in focus, and the new activity is iconified.
Ensure environment variables needed by Python activities are available
in each of the three supported scenarios;
- started from Sugar,
- started from Terminal inside Sugar,
- started by other desktop environments.
Variables always available are;
SUGAR_ACTIVITY_ROOT
SUGAR_BUNDLE_ID
SUGAR_BUNDLE_NAME
SUGAR_BUNDLE_PATH
SUGAR_BUNDLE_VERSION
Variables also available when started from Sugar are;
SUGAR_ACTIVITIES_HIDDEN
SUGAR_APISOCKET_KEY
SUGAR_APISOCKET_PORT
SUGAR_GROUP_LABELS
SUGAR_HOME
SUGAR_MIME_DEFAULTS
SUGAR_PROFILE
SUGAR_SCALING
SUGAR_VERSION
Variables also available when started from Terminal are;
SUGAR_TERMINAL_VERSION
Other changes;
- use os.makedirs in place of distutils.dir_util.mkpath,
- avoid redundant setting of SUGAR_BUNDLE_PATH,
- do not set SUGAR_BUNDLE_ID unnecessarily,
- add explanatory comment,
Tested on Ubuntu 18.04.
Signed-off-by: James Cameron <quozl@laptop.org>
Used when testing from the shell prompt using sugar-activity{,3}.
When Ctrl+C is pressed, close the activity.
May be used by other processes to request a clean activity stop, but
with save-as enabled may require user input.
Learners have to use tab to finish editing, followed by clicking the
activity icon to dismiss the dialog. A slow work flow and inconsistent
with journal list view. The enter key is ignored.
Add an activate signal handler to save the title. Force the focus to
move by calling hide and show.
Signed-off-by: James Cameron <quozl@laptop.org>
When an activity deletes the window associated with the canvas, save may
fail because Gdk.cairo_create is given an argument of None. Activity
continues to run without a window.
Reproduced with Chat activity and pressing Stop.
Avoid exception by returning None from get_preview when there is no
window.
When an activity is to stop, and the save-as setting is enabled, and the
journal entry has not been named, show an alert asking for a name, with
keyboard focus in the name entry with the name selected.
Return key commits the save with the name as shown.
Escape key cancels the alert and the stop.
While the alert is shown, the activity stop button(s) will be
insensitive.
As a side-effect, when an entry is resumed, switching to the journal
will show a clone entry with the same name. When the activity is
stopped, the clone entry will be removed or renamed. Forced power down
and reboot will show the clone entry.
https://wiki.sugarlabs.org/go/Features/Save-As
Signed-off-by: James Cameron <quozl@laptop.org>
Track the stop buttons for the activity, so that they can be set
insensitive or not in a later patch.
Our API allows for more than one stop button, though the use of more
than one is very rare.
- add a comment to explain the causes of keep failure,
- rename the keep failure response callback to fit convention,
- fix typo and whitespace nearby.
Every time an activity maintainer uses the `python setup.py genpot`
command the resulting po/Activity.pot file has changes caused by random
ordering of filesystem inodes.
This makes the output unpredictable.
Sort the list of source files.
When an external monitor is connected or disconnected, about 25% of the
time an activity does not resize correctly; a size-changed signal occurs
but the workarea geometry has not changed.
Underlying problem is an update race in get_monitor_workarea, so the fix
is to call get_monitor_geometry for obtaining the width and height.
Can be reproduced easily without an external monitor by switching
display panel resolution repeatedly;
xrandr --output eDP1 --mode 1024x768
xrandr --output eDP1 --mode 1366x768
Part of a fix for https://bugs.sugarlabs.org/ticket/4968
Many activities already have the repository url pointing to their GitHub
page - which also serves as a bug tracker for many of the projects. The
repository url is not part of the spec, but the bug tracker url is.
Ibiam Chihurumnaya