GTK4 Migration and Wayland Integration for Sugar Shell

autogen.sh

@@ -12,4 +12,4 @@ intltoolize --force
 autoreconf -i
 
 cd "$olddir"
-"$srcdir/configure" --enable-maintainer-mode "$@" --disable-python-byte-compile
+"$srcdir/configure" --enable-maintainer-mode "$@"

bin/sugar-backlight-setup

@@ -19,6 +19,8 @@ import os
 import sys
 from functools import cmp_to_key
 
+import gi
+gi.require_version('GUdev', '1.0')
 from gi.repository import GUdev
 
 

bin/sugar-control-panel

@@ -15,6 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
+import gi
+
+gi.require_version('Gtk', '4.0')
 
 from jarabe import config
 

bin/sugar-erase-bundle

@@ -1,27 +1,28 @@
 #!/usr/bin/env python3
-import os
-import sys
+import argparse
 
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
 
 from jarabe.model import bundleregistry
 
 
-def cmd_help():
-    print('Usage: sugar-erase-bundle bundle_id [...] \n\n\
-    Erase activity bundles\n')
+def main():
+    parser = argparse.ArgumentParser(description="Erase activity bundles")
+    parser.add_argument("bundles", nargs="+", metavar="bundle_id",
+                        help="Activity bundles to erase")
+    args = parser.parse_args()
 
+    registry = bundleregistry.get_registry()
 
-if len(sys.argv) < 2:
-    cmd_help()
-    exit(2)
+    for name in args.bundles:
+        bundle = registry.get_bundle(name)
+        if not bundle:
+            print('Cannot find %s bundle.' % name)
+            continue
+
+        registry.uninstall(bundle, delete_profile=True)
 
-for name in sys.argv[1:]:
-    registry = bundleregistry.get_registry()
-    bundle = registry.get_bundle(name)
-    if not bundle:
-        print('Cannot find %s bundle.' % name)
-        continue
 
-    registry.uninstall(bundle, delete_profile=True)
+if __name__ == '__main__':
+    main()

bin/sugar-install-bundle

@@ -1,28 +1,29 @@
 #!/usr/bin/env python3
+import argparse
 import os
-import sys
 
 from sugar4.bundle.activitybundle import ActivityBundle
 
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
 
 
-def cmd_help():
-    print('Usage: sugar-install-bundle activitybundle.xo [...] \n\n\
-    Install activity bundles\n')
+def main():
+    parser = argparse.ArgumentParser(description="Install activity bundles")
+    parser.add_argument("bundles", nargs="+", metavar="activitybundle.xo",
+                        help="Activity bundles to install")
+    args = parser.parse_args()
 
+    for name in args.bundles:
+        bundle = ActivityBundle(name)
+        path = bundle.install()
 
-if len(sys.argv) < 2:
-    cmd_help()
-    sys.exit(2)
+        # make sure that the BundleRegistry will add this bundle
+        # by triggering a GFileMonitor ATTRIBUTE_CHANGED event.
+        os.utime(path, None)
 
-for name in sys.argv[1:]:
-    bundle = ActivityBundle(name)
-    path = bundle.install()
+        print("%s: '%s' installed." % (parser.prog, name))
 
-    # make sure that the BundleRegistry will add this bundle
-    # by triggering a GFileMonitor ATTRIBUTE_CHANGED event.
-    os.utime(path, None)
 
-    print("%s: '%s' installed." % (sys.argv[0], name))
+if __name__ == '__main__':
+    main()

bin/sugar-launch

@@ -20,6 +20,9 @@ import sys
 import dbus
 import argparse
 
+import gi
+gi.require_version('Gtk', '4.0')
+
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
 
@@ -72,8 +75,8 @@ def _get_interpreter(exec_file):
         if not abs_path:
             return exec_file
 
-    f = open(abs_path)
-    line = f.readline(100)
+    with open(abs_path) as f:
+        line = f.readline(100)
     if line.startswith('#!'):
         cmds = line[2:].strip().split(' ')
         cmds.append(abs_path)
@@ -92,5 +95,10 @@ if args.debug:
     cmd_args.extend(_get_interpreter(act_args.pop(0)))
     cmd_args.extend(act_args)
 
+env = activityfactory.get_environment(activity)
+if 'WAYLAND_DISPLAY' in os.environ:
+    env['WAYLAND_DISPLAY'] = os.environ['WAYLAND_DISPLAY']
+    env['GDK_BACKEND'] = 'wayland'
+
 os.chdir(str(activity.get_path()))
-os.execvpe(cmd_args[0], cmd_args, activityfactory.get_environment(activity))
+os.execvpe(cmd_args[0], cmd_args, env)

bin/sugar.in

@@ -32,12 +32,8 @@ if test -z "$SUGAR_ACTIVITIES_HIDDEN"; then
     export SUGAR_ACTIVITIES_HIDDEN="$sugardatadir/activities.hidden"
 fi
 
-export GTK2_RC_FILES="@prefix@/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc"
-
-if ! test -f "$GTK2_RC_FILES"; then
-    echo "sugar: ERROR: Gtk theme for scaling $SUGAR_SCALING not available in path $GTK2_RC_FILES"
-    exit 1
-fi
+export GDK_BACKEND="wayland"
+export GTK_THEME="Sugar"
 
 # Set default language
 export LANG="${LANG:-en_US.utf8}"

configure.ac

@@ -1,6 +1,6 @@
 AC_INIT([Sugar],[0.121],[],[sugar])
 
-AC_PREREQ([2.59])
+AC_PREREQ([2.72])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -25,7 +25,7 @@ AC_SUBST([GETTEXT_PACKAGE])
 AM_GLIB_GNU_GETTEXT
 
 AC_ARG_ENABLE(update-mimedb,
-   AC_HELP_STRING([--disable-update-mimedb],
+   AS_HELP_STRING([--disable-update-mimedb],
                    [disable the update-mime-database after install [default=no]]),,
     enable_update_mimedb=yes)
 AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)

data/icons/Makefile.am

@@ -11,6 +11,8 @@ sugar_DATA =                        \
 	module-network.svg              \
 	module-power.svg                \
 	module-updater.svg		\
-	module-webaccount.svg
+	module-webaccount.svg		\
+	list-add.svg			\
+	list-remove.svg
 
 EXTRA_DIST = $(sugar_DATA)

extensions/cpsection/aboutcomputer/model.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2008 One Laptop Per Child
+# Copyright (C) 2008 One Laptop Per Child
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 from jarabe import config
 from jarabe.model.network import get_wireless_interfaces
 
-
 _OFW_TREE = '/ofw'
 _PROC_TREE = '/proc/device-tree'
 _DMI_DIRECTORY = '/sys/class/dmi/id'
@@ -234,7 +233,7 @@ def _read_file(path):
 
 def get_license():
     license_file = os.path.join(config.data_path, 'GPLv3')
-    lang = os.environ['LANG']
+    lang = os.environ.get('LANG', 'en_US.UTF-8')
     if lang.endswith('UTF-8'):
         lang = lang[:-6]