Re: [Sugar-devel] [sugar-toolkit-gtk3 PATCH] sl#4276: Writing the icon-files for .xo files on a permanent mount-point, and not /tmp. mount-point.
Hi all. I will leave the choice of deciding upon the icon files directory to you guys :) My personal opinion :: I would refrain from using the /tmp directory, since it is, well, temporary mount-point, and I would not point to delve too much into shakeable territory. This is confirmed in Fedora-18, because as far as I know, in Fedora-14, we were using /tmp too, but never faced any problems then. However, now in Fedora-18, the problem is being faced, owing to special-ness of /tmp. On Tue, Dec 11, 2012 at 6:56 PM, Daniel Narvaez dwnarv...@gmail.com wrote: On 11 December 2012 14:19, Manuel Quiñones ma...@laptop.org wrote: 2012/12/11 Gonzalo Odiard gonz...@laptop.org: In the meantime, have the icons cached in a directory is no so bad. Maybe we can do it in /tmp/ to get it deleted at startup without need more Yes, I think using /tmp is the way to go. And the Journal is doing that for the same icon in the palette and details view already. Isn't this more or less a cache? If so we could use XDG_CACHE_DIR http://developer.gnome.org/glib/stable/glib-Miscellaneous-Utility-Functions.html#g-get-user-cache-dir ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel -- Regards, Ajay Garg Dextrose Developer Activity Central: http://activitycentral.com ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [sugar-toolkit-gtk3 PATCH] sl#4276: Writing the icon-files for .xo files on a permanent mount-point, and not /tmp. mount-point.
Just as additional data point, I'm planning to migrate sugar to use the XDG directories. Posting an initial plan right now. On 15 December 2012 09:03, Ajay Garg a...@activitycentral.com wrote: Hi all. I will leave the choice of deciding upon the icon files directory to you guys :) My personal opinion :: I would refrain from using the /tmp directory, since it is, well, temporary mount-point, and I would not point to delve too much into shakeable territory. This is confirmed in Fedora-18, because as far as I know, in Fedora-14, we were using /tmp too, but never faced any problems then. However, now in Fedora-18, the problem is being faced, owing to special-ness of /tmp. On Tue, Dec 11, 2012 at 6:56 PM, Daniel Narvaez dwnarv...@gmail.com wrote: On 11 December 2012 14:19, Manuel Quiñones ma...@laptop.org wrote: 2012/12/11 Gonzalo Odiard gonz...@laptop.org: In the meantime, have the icons cached in a directory is no so bad. Maybe we can do it in /tmp/ to get it deleted at startup without need more Yes, I think using /tmp is the way to go. And the Journal is doing that for the same icon in the palette and details view already. Isn't this more or less a cache? If so we could use XDG_CACHE_DIR http://developer.gnome.org/glib/stable/glib-Miscellaneous-Utility-Functions.html#g-get-user-cache-dir ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel -- Regards, Ajay Garg Dextrose Developer Activity Central: http://activitycentral.com -- Daniel Narvaez ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Porting to GSettings and XDG directories
Hello, after we branch and the patches I already sent lands, I would like to port sugar to use GSettings and XDG home directories. Here is what I have in mind right now, after a quick initial investigation. * Port glucose to use GSettings. * Port browse and read to use GSettings. * Hopefully activity maintainers will port the rest of the activities? Should not be much work but a bit tricky. * If they used their own keys, stuff will keep working as long as we keep GConf as a dependency. Though the system wide gsettings-data-convert configuration will need to be updated when they port. * If they tried to get the sugar keys (like buddy color) instead of going through sugar.profile, they will get outdated settings until they port. * Port glucose to use g_get_user_* instead of env.get_profile_path * Remove env.get_profile_path. It should not have been used outside glucose (right??). * Remove support for multiple profiles. sugar-build is already providing it on the base of xdg directories and it's a developer only feature afaik. * Write a sugar-data-convert script, executed at startup, which moves the files/directories to the new paths and runs gsettings-data-convert. Suggestions welcome! -- Daniel Narvaez ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Patch in need of application - Kandid Activity
Could someone from the Activity Team please take a look at applying the patch attached to http://bugs.sugarlabs.org/ticket/3122 to the Kandid activity http://git.sugarlabs.org/kandid I am not sure the maintainer is still active. This would solve a series of i18n issues that have been throwing errors in the POT generation process for some time. Thank you for your attention to this matter. cjl ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] Flashing Upstream Image allows to listen to boot-up sound ... but none other
Hi All, Flashing 31018o0 Image on XO-1 (Build: 13.1.0 for XO-1 (Build 18))allows to listen to boot-up sound ... but none other. This happens on one XO, but does not show the same issue on another XO-1. Following are the details of the XO which does not play any sound: Serial Number: CSN74802D48 Firmware: Q2E46 Following are the details of the XO which plays the sound: Serial Number: SHF725004AA Firmware: Q2E45 Has anyone faced a similar issue on XO-1? Is it possible that a higher Firmware version may be the cause ofsu no sound? Would appreciate clarity on this point! Thanks and Regards, Nitika Mangal QA Manager Activity Central: http://activitycentral.com ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Porting to GSettings and XDG directories
2012/12/15 Daniel Narvaez dwnarv...@gmail.com: Hello, after we branch and the patches I already sent lands, I would like to port sugar to use GSettings and XDG home directories. Here is what I have in mind right now, after a quick initial investigation. * Port glucose to use GSettings. * Port browse and read to use GSettings. * Hopefully activity maintainers will port the rest of the activities? Should not be much work but a bit tricky. * If they used their own keys, stuff will keep working as long as we keep GConf as a dependency. Though the system wide gsettings-data-convert configuration will need to be updated when they port. * If they tried to get the sugar keys (like buddy color) instead of going through sugar.profile, they will get outdated settings until they port. * Port glucose to use g_get_user_* instead of env.get_profile_path * Remove env.get_profile_path. It should not have been used outside glucose (right??). * Remove support for multiple profiles. sugar-build is already providing it on the base of xdg directories and it's a developer only feature afaik. * Write a sugar-data-convert script, executed at startup, which moves the files/directories to the new paths and runs gsettings-data-convert. Suggestions welcome! Looks like an awesome plan. I hope your patches can be reviewed soon, when the sugar branch for new development is made. Thanks, -- .. manuq .. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Yama First impressions, OLPC OS 13.1 31018
Kim kimtoufectis at gmail.com writes: I'd call my 1.5 HS first impressions poor. Beginning from a clean install (fs-update from a USB stick), things loaded fine and the opening hello boot-up experience is improved. After using the control panel to connect to the web, set time, place, jabber, and frame settings, I killed Sugar in Browse amost immediately (I tried to save the clipping I had just made of my developer key link to my journal using the context menu the appears when hovering over the clipping icon on the left side of the frame). In three years of using an xo-1 and -1.5, this OS crashed more quickly than any other, and that includes some of the earlier builds in this sequence (number 8 didn't have these problems). Finally getting the developeer key into Terminal produced a that certificate is invalid message, so to complete the process I needed to add --no-check-certificate to the end of the command as instructed. These are great ways to let send non-tech folks like me know they're not the target audience... I agree the Sugar interface doesn't seem a developer priority right now; that's a shame. I am puzzled that brand new activities often only support older OS's...and Dextrose 3 had some features I've given up hoping for in other versions of sugar, like an indicator of processor/memory strain in the frame and an easy way to offer user feedback Switching over to the Gnome interface also failed to delight: I can't hide the bars at the top and bottom of the screen by right-clicking as I could in the past, and choosing on Change Desktop Background after right-clicking on the desktop did nothing. In gnome I do like that I don't have to reconnect to wifi; my settings carry over from Sugar. Playing with this iteration of Sugar some more on a 1.5 HS, I find that trying to save any clipping to the journal kills the activity, and code streams by on a black background as (presumably) Sugar reboots, whether in Browse or elsewhere. As was true for version 8, certain letters (L's and I's I think) seem to vanish from certain text; so Feliz Navidad becomes Fe z Nav dad in the similarly-named activity. Closing that activity also caused Sugar to reboot. Ignore the repeat that follows; I wasn't able to post less than I quoted so I'm just going to triple my post through repetition. Playing with this iteration of Sugar some more on a 1.5 HS, I find that trying to save any clipping to the journal kills the activity, and code streams by on a black background as (presumably) Sugar reboots, whether in Browse or elsewhere. As was true for version 8, certain letters (L's and I's I think) seem to vanish from certain text; so Feliz Navidad becomes Fe z Nav dad in the similarly-named activity. Closing that activity also caused Sugar to reboot. Playing with this iteration of Sugar some more on a 1.5 HS, I find that trying to save any clipping to the journal kills the activity, and code streams by on a black background as (presumably) Sugar reboots, whether in Browse or elsewhere. As was true for version 8, certain letters (L's and I's I think) seem to vanish from certain text; so Feliz Navidad becomes Fe z Nav dad in the similarly-named activity. Closing that activity also caused Sugar to reboot. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Yama First impressions, OLPC OS 13.1 31018
On 12/15/12 13:50, Kim wrote: Kim kimtoufectis at gmail.com writes: I'd call my 1.5 HS first impressions poor. Beginning from a clean install (fs-update from a USB stick), things loaded fine and the opening hello boot-up experience is improved. After using the control panel to connect to the web, set time, place, jabber, and frame settings, I killed Sugar in Browse amost immediately (I tried to save the clipping I had just made of my developer key link to my journal using the context menu the appears when hovering over the clipping icon on the left side of the frame). In three years of using an xo-1 and -1.5, this OS crashed more quickly than any other, and that includes some of the earlier builds in this sequence (number 8 didn't have these problems). Finally getting the developeer key into Terminal produced a that certificate is invalid message, so to complete the process I needed to add --no-check-certificate to the end of the command as instructed. These are great ways to let send non-tech folks like me know they're not the target audience... I agree the Sugar interface doesn't seem a developer priority right now; that's a shame. I am puzzled that brand new activities often only support older OS's...and Dextrose 3 had some features I've given up hoping for in other versions of sugar, like an indicator of processor/memory strain in the frame and an easy way to offer user feedback Switching over to the Gnome interface also failed to delight: I can't hide the bars at the top and bottom of the screen by right-clicking as I could in the past, and choosing on Change Desktop Background after right-clicking on the desktop did nothing. In gnome I do like that I don't have to reconnect to wifi; my settings carry over from Sugar. Playing with this iteration of Sugar some more on a 1.5 HS, I find that trying to save any clipping to the journal kills the activity, and code streams by on a black background as (presumably) Sugar reboots, whether in Browse or elsewhere. As was true for version 8, certain letters (L's and I's I think) seem to vanish from certain text; so Feliz Navidad becomes Fe z Nav dad in the similarly-named activity. Closing that activity also caused Sugar to reboot. Ignore the repeat that follows; I wasn't able to post less than I quoted so I'm just going to triple my post through repetition. Playing with this iteration of Sugar some more on a 1.5 HS, I find that trying to save any clipping to the journal kills the activity, and code streams by on a black background as (presumably) Sugar reboots, whether in Browse or elsewhere. Seems to general bug : http://bugs.sugarlabs.org/ticket/4312 f18 TC-1-selecting text from entry line and hitting copy with mouse in IRC-10 causes sugar-desktop and SoaS to reboot Quoted from bug:Actually, its not only localized to IRC. I tried Copy in Browse and ViewSlides and it crashes sugar. https://bugzilla.redhat.com/show_bug.cgi?id=885319f18 TC-1-selecting text from entry line and hitting copy with mouse in IRC-10 causes sugar-desktop and SoaS to reboot As was true for version 8, certain letters (L's and I's I think) seem to vanish from certain text; so Feliz Navidad becomes Fe z Nav dad in the similarly-named activity. Closing that activity also caused Sugar to reboot. Playing with this iteration of Sugar some more on a 1.5 HS, I find that trying to save any clipping to the journal kills the activity, and code streams by on a black background as (presumably) Sugar reboots, whether in Browse or elsewhere. As was true for version 8, certain letters (L's and I's I think) seem to vanish from certain text; so Feliz Navidad becomes Fe z Nav dad in the similarly-named activity. Closing that activity also caused Sugar to reboot. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH sugar] Drop sugar-emulator
From: Daniel Narvaez dwnarv...@gmail.com Replaced by the sugar-runner module. Rationale: * sugar-runner is similar in concept to sugar-emulator but it provides a better user experience. It runs also from a text console (into a standard X server). It works around Xephyr issues like international keyboards and multiple outputs. It tries to work out of the box everywhere, for example by offering to tweak Xwrapper.config where necessary. * sugar-runner is better tested with recent sugar code and recent distributions. It also integrates with sugar-build. * A separate module make sense here because most users will never run this code. It's largely a collection of hacks which are not necessary when running as a normal desktop environment. Why now: * We are starting to use GSettings, which requires to setup the xdg directories to avoid conflicts with GNOME. Thus we would require to make changes to sugar-emulator to setup these properly. Maintaining two separate implementation of basically the same thing is a waste of resources. * We are at the beginning of the cycle, the best time for potentially disruptive changes. --- README |1 - bin/Makefile.am|1 - bin/sugar-emulator | 14 --- configure.ac |1 - data/Makefile.am |3 - data/sugar-emulator.desktop.in | 10 --- src/jarabe/model/session.py| 15 +--- src/jarabe/model/sound.py | 10 +-- src/jarabe/util/Makefile.am|1 - src/jarabe/util/emulator.py| 194 src/jarabe/view/keyhandler.py |5 -- 11 files changed, 5 insertions(+), 250 deletions(-) delete mode 100755 bin/sugar-emulator delete mode 100644 data/sugar-emulator.desktop.in delete mode 100644 src/jarabe/util/emulator.py diff --git a/README b/README index 1f89810..cfc196e 100644 --- a/README +++ b/README @@ -38,7 +38,6 @@ Alt+r Rotate the screen Alt+o Toggle overlay visibility Alt+= Open the developer console Alt+0 Open the developer console -Alt+q Quit the emulator Ctrl+s Activate sketch mode in chat diff --git a/bin/Makefile.am b/bin/Makefile.am index cb671da..bd38323 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,6 +1,5 @@ python_scripts = \ sugar-control-panel \ - sugar-emulator \ sugar-install-bundle\ sugar-launch diff --git a/bin/sugar-emulator b/bin/sugar-emulator deleted file mode 100755 index 308aac7..000 --- a/bin/sugar-emulator +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -if [ $(id -u) -eq 0 -o $(id -ru) -eq 0 ] ; then - echo Refusing to run as root. - exit 3 -fi - -# Source debug definitions -if [ -f ~/.sugar/debug ]; then -. ~/.sugar/debug -fi - -# Start emulator -python -c import sys; from jarabe.util import emulator; sys.argv[0]='$0'; emulator.main() $@ diff --git a/configure.ac b/configure.ac index 137e53a..9eae29e 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,6 @@ bin/Makefile bin/sugar data/icons/Makefile data/Makefile -data/sugar-emulator.desktop extensions/cpsection/aboutcomputer/Makefile extensions/cpsection/aboutme/Makefile extensions/cpsection/datetime/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 6a62d23..39bdb35 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -23,9 +23,6 @@ GTKRC_FILES = \ xsessionsdir = $(datadir)/xsessions xsessions_DATA = sugar.desktop -applicationsdir = $(datadir)/applications -applications_DATA = sugar-emulator.desktop - mime_xml_in_files = sugar.xml.in mime_xml_files = $(mime_xml_in_files:.xml.in=.xml) @INTLTOOL_XML_RULE@ diff --git a/data/sugar-emulator.desktop.in b/data/sugar-emulator.desktop.in deleted file mode 100644 index 6247bd7..000 --- a/data/sugar-emulator.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Sugar -GenericName=Sugar Emulator -Comment=The emulator for the Sugar Desktop Environment -Exec=@prefix@/bin/sugar-emulator -Terminal=false -Type=Application -Icon=sugar-xo -Categories=Education;Teaching; diff --git a/src/jarabe/model/session.py b/src/jarabe/model/session.py index a5cd4a4..a708633 100644 --- a/src/jarabe/model/session.py +++ b/src/jarabe/model/session.py @@ -54,9 +54,7 @@ class SessionManager(session.SessionManager): self.initiate_shutdown() def shutdown_completed(self): -if env.is_emulator(): -self._close_emulator() -elif self._logout_mode != self.MODE_LOGOUT: +if self._logout_mode != self.MODE_LOGOUT: bus = dbus.SystemBus() if have_systemd(): try: @@ -93,17 +91,6 @@ class SessionManager(session.SessionManager): session.SessionManager.shutdown_completed(self) Gtk.main_quit() -def _close_emulator(self): -Gtk.main_quit() - -if 'SUGAR_EMULATOR_PID' in os.environ: -pid = int(os.environ['SUGAR_EMULATOR_PID']) -
[Sugar-devel] [PATCH sugar-toolkit-gtk3] Deprecate env.is_emulator
From: Daniel Narvaez dwnarv...@gmail.com
We are not providing an emulator script with sugar anymore and
anyway special casing should not be necessary. Even less to
provide a way to do it in our public API.
---
src/sugar3/env.py |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/sugar3/env.py b/src/sugar3/env.py
index e681f4f..d2ad8b6 100644
--- a/src/sugar3/env.py
+++ b/src/sugar3/env.py
@@ -22,9 +22,9 @@ STABLE.
import os
-
+# DEPRECATED
def is_emulator():
-return os.environ.get('SUGAR_EMULATOR', 'no') == 'yes'
+return False
def get_profile_path(path=None):
--
1.7.10.4
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH sugar] Drop sugar-emulator
From: Daniel Narvaez dwnarv...@gmail.com Replaced by the sugar-runner module. Rationale: * sugar-runner is similar in concept to sugar-emulator but it provides a better user experience. It runs also from a text console (into a standard X server). It works around Xephyr issues like international keyboards and multiple outputs. It tries to work out of the box everywhere, for example by offering to tweak Xwrapper.config where necessary. * sugar-runner is better tested with recent sugar code and recent distributions. It also integrates with sugar-build. * A separate module make sense here because most users will never run this code. It's largely a collection of hacks which are not necessary when running as a normal desktop environment. Why now: * We are starting to use GSettings, which requires to setup the xdg directories to avoid conflicts with GNOME. Thus we would require to make changes to sugar-emulator to setup these properly. Maintaining two separate implementation of basically the same thing is a waste of resources. * We are at the beginning of the cycle, the best time for potentially disruptive changes. --- README |1 - bin/Makefile.am|1 - bin/sugar-emulator | 14 --- configure.ac |1 - data/Makefile.am |6 -- data/sugar-emulator.desktop.in | 10 --- data/sugar-xo.svg |7 -- src/jarabe/model/session.py| 15 +--- src/jarabe/model/sound.py | 10 +-- src/jarabe/util/Makefile.am|1 - src/jarabe/util/emulator.py| 194 src/jarabe/view/keyhandler.py |5 -- 12 files changed, 5 insertions(+), 260 deletions(-) delete mode 100755 bin/sugar-emulator delete mode 100644 data/sugar-emulator.desktop.in delete mode 100644 data/sugar-xo.svg delete mode 100644 src/jarabe/util/emulator.py diff --git a/README b/README index 1f89810..cfc196e 100644 --- a/README +++ b/README @@ -38,7 +38,6 @@ Alt+r Rotate the screen Alt+o Toggle overlay visibility Alt+= Open the developer console Alt+0 Open the developer console -Alt+q Quit the emulator Ctrl+s Activate sketch mode in chat diff --git a/bin/Makefile.am b/bin/Makefile.am index cb671da..bd38323 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,6 +1,5 @@ python_scripts = \ sugar-control-panel \ - sugar-emulator \ sugar-install-bundle\ sugar-launch diff --git a/bin/sugar-emulator b/bin/sugar-emulator deleted file mode 100755 index 308aac7..000 --- a/bin/sugar-emulator +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -if [ $(id -u) -eq 0 -o $(id -ru) -eq 0 ] ; then - echo Refusing to run as root. - exit 3 -fi - -# Source debug definitions -if [ -f ~/.sugar/debug ]; then -. ~/.sugar/debug -fi - -# Start emulator -python -c import sys; from jarabe.util import emulator; sys.argv[0]='$0'; emulator.main() $@ diff --git a/configure.ac b/configure.ac index 137e53a..9eae29e 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,6 @@ bin/Makefile bin/sugar data/icons/Makefile data/Makefile -data/sugar-emulator.desktop extensions/cpsection/aboutcomputer/Makefile extensions/cpsection/aboutme/Makefile extensions/cpsection/datetime/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 6a62d23..25b94cd 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -23,9 +23,6 @@ GTKRC_FILES = \ xsessionsdir = $(datadir)/xsessions xsessions_DATA = sugar.desktop -applicationsdir = $(datadir)/applications -applications_DATA = sugar-emulator.desktop - mime_xml_in_files = sugar.xml.in mime_xml_files = $(mime_xml_in_files:.xml.in=.xml) @INTLTOOL_XML_RULE@ @@ -61,8 +58,5 @@ if GCONF_SCHEMAS_INSTALL GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule sugar.schemas 21 /dev/null endif -icondir = $(datadir)/icons/hicolor/scalable/apps -icon_DATA = sugar-xo.svg - EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(nmservice_DATA) $(mime_xml_in_files) em.py gtkrc.em $(schema_in_files) $(icon_DATA) CLEANFILES = $(GTKRC_FILES) $(mime_xml_files) $(schema_DATA) diff --git a/data/sugar-emulator.desktop.in b/data/sugar-emulator.desktop.in deleted file mode 100644 index 6247bd7..000 --- a/data/sugar-emulator.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Sugar -GenericName=Sugar Emulator -Comment=The emulator for the Sugar Desktop Environment -Exec=@prefix@/bin/sugar-emulator -Terminal=false -Type=Application -Icon=sugar-xo -Categories=Education;Teaching; diff --git a/data/sugar-xo.svg b/data/sugar-xo.svg deleted file mode 100644 index b673179..000 --- a/data/sugar-xo.svg +++ /dev/null @@ -1,7 +0,0 @@ -?xml version=1.0 ?!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [ - !ENTITY stroke_color #010101 - !ENTITY fill_color #FF -]svg
Re: [Sugar-devel] [PATCH sugar] Drop sugar-emulator
Forgot to remove the icon, sent an updated patch. On 16 December 2012 00:24, Daniel Narvaez dwnarv...@gmail.com wrote: From: Daniel Narvaez dwnarv...@gmail.com Replaced by the sugar-runner module. Rationale: * sugar-runner is similar in concept to sugar-emulator but it provides a better user experience. It runs also from a text console (into a standard X server). It works around Xephyr issues like international keyboards and multiple outputs. It tries to work out of the box everywhere, for example by offering to tweak Xwrapper.config where necessary. * sugar-runner is better tested with recent sugar code and recent distributions. It also integrates with sugar-build. * A separate module make sense here because most users will never run this code. It's largely a collection of hacks which are not necessary when running as a normal desktop environment. Why now: * We are starting to use GSettings, which requires to setup the xdg directories to avoid conflicts with GNOME. Thus we would require to make changes to sugar-emulator to setup these properly. Maintaining two separate implementation of basically the same thing is a waste of resources. * We are at the beginning of the cycle, the best time for potentially disruptive changes. --- README |1 - bin/Makefile.am|1 - bin/sugar-emulator | 14 --- configure.ac |1 - data/Makefile.am |3 - data/sugar-emulator.desktop.in | 10 --- src/jarabe/model/session.py| 15 +--- src/jarabe/model/sound.py | 10 +-- src/jarabe/util/Makefile.am|1 - src/jarabe/util/emulator.py| 194 src/jarabe/view/keyhandler.py |5 -- 11 files changed, 5 insertions(+), 250 deletions(-) delete mode 100755 bin/sugar-emulator delete mode 100644 data/sugar-emulator.desktop.in delete mode 100644 src/jarabe/util/emulator.py diff --git a/README b/README index 1f89810..cfc196e 100644 --- a/README +++ b/README @@ -38,7 +38,6 @@ Alt+r Rotate the screen Alt+o Toggle overlay visibility Alt+= Open the developer console Alt+0 Open the developer console -Alt+q Quit the emulator Ctrl+s Activate sketch mode in chat diff --git a/bin/Makefile.am b/bin/Makefile.am index cb671da..bd38323 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,6 +1,5 @@ python_scripts = \ sugar-control-panel \ - sugar-emulator \ sugar-install-bundle\ sugar-launch diff --git a/bin/sugar-emulator b/bin/sugar-emulator deleted file mode 100755 index 308aac7..000 --- a/bin/sugar-emulator +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -if [ $(id -u) -eq 0 -o $(id -ru) -eq 0 ] ; then - echo Refusing to run as root. - exit 3 -fi - -# Source debug definitions -if [ -f ~/.sugar/debug ]; then -. ~/.sugar/debug -fi - -# Start emulator -python -c import sys; from jarabe.util import emulator; sys.argv[0]='$0'; emulator.main() $@ diff --git a/configure.ac b/configure.ac index 137e53a..9eae29e 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,6 @@ bin/Makefile bin/sugar data/icons/Makefile data/Makefile -data/sugar-emulator.desktop extensions/cpsection/aboutcomputer/Makefile extensions/cpsection/aboutme/Makefile extensions/cpsection/datetime/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 6a62d23..39bdb35 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -23,9 +23,6 @@ GTKRC_FILES = \ xsessionsdir = $(datadir)/xsessions xsessions_DATA = sugar.desktop -applicationsdir = $(datadir)/applications -applications_DATA = sugar-emulator.desktop - mime_xml_in_files = sugar.xml.in mime_xml_files = $(mime_xml_in_files:.xml.in=.xml) @INTLTOOL_XML_RULE@ diff --git a/data/sugar-emulator.desktop.in b/data/sugar-emulator.desktop.in deleted file mode 100644 index 6247bd7..000 --- a/data/sugar-emulator.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Sugar -GenericName=Sugar Emulator -Comment=The emulator for the Sugar Desktop Environment -Exec=@prefix@/bin/sugar-emulator -Terminal=false -Type=Application -Icon=sugar-xo -Categories=Education;Teaching; diff --git a/src/jarabe/model/session.py b/src/jarabe/model/session.py index a5cd4a4..a708633 100644 --- a/src/jarabe/model/session.py +++ b/src/jarabe/model/session.py @@ -54,9 +54,7 @@ class SessionManager(session.SessionManager): self.initiate_shutdown() def shutdown_completed(self): -if env.is_emulator(): -self._close_emulator() -elif self._logout_mode != self.MODE_LOGOUT: +if self._logout_mode != self.MODE_LOGOUT: bus = dbus.SystemBus() if have_systemd(): try: @@ -93,17 +91,6 @@ class SessionManager(session.SessionManager):
Re: [Sugar-devel] Yama First impressions, OLPC OS 13.1 31018
I'd call my 1.5 HS first impressions poor. Beginning from a clean install (fs-update from a USB stick), things loaded fine and the opening hello boot-up experience is improved. After using the control panel to connect to the web, set time, place, jabber, and frame settings, I killed Sugar in Browse amost immediately (I tried to save the clipping I had just made of my developer key link to my journal using the context menu the appears when hovering over the clipping icon on the left side of the frame). In three years of using an xo-1 and -1.5, this OS crashed more quickly than any other, and that includes some of the earlier builds in this sequence (number 8 didn't have these problems). We have a few big problems with clipboard and we are trying to solve them. The problem is not in sugar code, but in the lower level libraries, but the final result affect us. Gonzalo ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Flashing Upstream Image allows to listen to boot-up sound ... but none other
Startup sound volume is saved. Has you tested press a few times volume up key while booting? Gonzalo On Sat, Dec 15, 2012 at 11:28 AM, nitika.mail nit...@activitycentral.comwrote: Hi All, Flashing 31018o0 Image on XO-1 (Build: 13.1.0 for XO-1 (Build 18))allows to listen to boot-up sound ... but none other. This happens on one XO, but does not show the same issue on another XO-1. Following are the details of the XO which does not play any sound: Serial Number: CSN74802D48 Firmware: Q2E46 Following are the details of the XO which plays the sound: Serial Number: SHF725004AA Firmware: Q2E45 Has anyone faced a similar issue on XO-1? Is it possible that a higher Firmware version may be the cause ofsu no sound? Would appreciate clarity on this point! Thanks and Regards, Nitika Mangal QA Manager Activity Central: http://activitycentral.com ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
