Re: [Sugar-devel] [PATCH 4/4] Restore load homepage functionality
2011/11/30 Anish Mangal an...@activitycentral.org
On Wed 30 Nov 2011 10:11:43 AM IST, Manuel Quiñones wrote:
Signed-off-by: Manuel Quiñones ma...@laptop.org
---
browser.py | 14 ++
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/browser.py b/browser.py
index 320cb62..789988d 100644
--- a/browser.py
+++ b/browser.py
@@ -39,7 +39,11 @@ import sessionstore
from widgets import BrowserNotebook
_ZOOM_AMOUNT = 0.1
-_LIBRARY_PATH = '/usr/share/library-common/index.html'
+if os.path.isfile('/usr/share/library-common/index.html'):
+_HOMEPAGE_PATH = '/usr/share/library-common/index.html'
+else:
+_HOMEPAGE_PATH = os.path.join(activity.get_bundle_path(),
+data/index.html)
class SaveListener(object):
@@ -272,13 +276,7 @@ class TabbedView(BrowserNotebook):
def load_homepage(self):
browser = self.current_browser
-
-if os.path.isfile(_LIBRARY_PATH):
-browser.load_uri('file://' + _LIBRARY_PATH)
-else:
-default_page = os.path.join(activity.get_bundle_path(),
-data/index.html)
-browser.load_uri(default_page)
+browser.load_uri('file://' + _HOMEPAGE_PATH)
def _get_current_browser(self):
return self.get_nth_page(self.get_current_page()).get_child()
nitpicky
IMO, moving the code from here to above is probably fine, but removing
_LIBRARY_PATH would be adding that extra bit of complexity to the code.
Having the variable makes it clear that:
if LIBRARY_PATH:
load it
else
load HOMEPAGE_PATH
Also, maybe having an else-if instead of else for the HOMEPAGE_PATH
check and having all this in a try..except would be safer
/nitpicky
+1.
Reviewed-by: Anish Mangal an...@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
Re: [Sugar-devel] [Dextrose] Proxy Control Panel (Was: New Dextrose-3...)
Have you guys taken a look at total parent control... its an all in one gui
that controls dansguardian, firehol, and squid, and is maintained quite
heavily by many side projects apart from canonical:
https://launchpad.net/webcontentcontrol
Its worth a look
kind regards,
David van assche
On Wed, Nov 30, 2011 at 6:42 AM, Frederick Grose fgr...@gmail.com wrote:
On Tue, Nov 29, 2011 at 11:23 PM, Sameer Verma sve...@sfsu.edu wrote:
On Tue, Nov 29, 2011 at 2:01 PM, Bernie Innocenti ber...@sugarlabs.org
wrote:
On Tue, 2011-11-29 at 20:14 +, Aleksey Lim wrote:
{...}
If someone had the time to work on UI cleanups, I'd prefer to see both
the Network and Modem control panels be replaced by options directly
associated with the objects they manipulate:
- a radio-off checkbox in the popup menu of the wifi device
While we are at it, I think a radio button is a better choice for
radio on/off instead of the check box. I have a hard time remembering
what happens when you check the box :-)
Sameer
I find the wording around the box contributes to uncertainty about its
action:
Wireless
Turn off the wireless radio to save battery life
□ Radio
Discard network history if you have
trouble connecting to the network
(Discard network history)
The 'Discard network history' button is always the affirmative action for
the preceding advisory. The 'Turn off' advisory for the Radio check box is
only similarly aligned when the box is checked (otherwise, one might wonder
does it 'Turn off' or 'Turn on' the radio).
--Fred
___
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] [ASLO] Release Turtle in a Pond-3
Activity Homepage: http://activities.sugarlabs.org/addon/4516 Sugar Platform: 0.82 - 0.96 Download Now: http://activities.sugarlabs.org/downloads/file/27765/turtle_in_a_pond-3.xo Release notes: 3 ENHANCEMENTS: * Improved graphics (turtle is now a turtle) * Error messages from custom strategy appears on toolbar * Reloading strategy starts new game * Improved documentation (tip of the hat to Tony Forster); please see http://wiki.sugarlabs.org/go/Activities/Turtle_in_a_Pond Sugar Labs Activities http://activities.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [ASLO] Release Turtle in a Pond-3
Hi, Just try it.. Is good.. But the Turtle not are smarth enough... The cat yes... :-) Maybe, could have several levels, or at least, an easy and hard.. Regards Alan To: sugar-devel@lists.sugarlabs.org Date: Wed, 30 Nov 2011 12:18:00 -0500 From: activit...@sugarlabs.org Subject: [Sugar-devel] [ASLO] Release Turtle in a Pond-3 Activity Homepage: http://activities.sugarlabs.org/addon/4516 Sugar Platform: 0.82 - 0.96 Download Now: http://activities.sugarlabs.org/downloads/file/27765/turtle_in_a_pond-3.xo Release notes: 3 ENHANCEMENTS: * Improved graphics (turtle is now a turtle) * Error messages from custom strategy appears on toolbar * Reloading strategy starts new game * Improved documentation (tip of the hat to Tony Forster); please see http://wiki.sugarlabs.org/go/Activities/Turtle_in_a_Pond Sugar Labs Activities http://activities.sugarlabs.org ___ 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
Re: [Sugar-devel] [ASLO] Release Turtle in a Pond-3
On Wed, Nov 30, 2011 at 12:41 PM, Alan Jhonn Aguiar Schwyn alan...@hotmail.com wrote: Hi, Just try it.. Is good.. But the Turtle not are smarth enough... The cat yes... :-) Maybe, could have several levels, or at least, an easy and hard.. Please program a more clever turtle for me :) See http://wiki.sugarlabs.org/go/Activities/Turtle_in_a_Pond#Strategy -walter Regards Alan To: sugar-devel@lists.sugarlabs.org Date: Wed, 30 Nov 2011 12:18:00 -0500 From: activit...@sugarlabs.org Subject: [Sugar-devel] [ASLO] Release Turtle in a Pond-3 Activity Homepage: http://activities.sugarlabs.org/addon/4516 Sugar Platform: 0.82 - 0.96 Download Now: http://activities.sugarlabs.org/downloads/file/27765/turtle_in_a_pond-3.xo Release notes: 3 ENHANCEMENTS: * Improved graphics (turtle is now a turtle) * Error messages from custom strategy appears on toolbar * Reloading strategy starts new game * Improved documentation (tip of the hat to Tony Forster); please see http://wiki.sugarlabs.org/go/Activities/Turtle_in_a_Pond Sugar Labs Activities http://activities.sugarlabs.org ___ 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 -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [ASLO] Release Turtle in a Pond-3
On 30.11.2011, at 19:02, Walter Bender wrote: On Wed, Nov 30, 2011 at 12:41 PM, Alan Jhonn Aguiar Schwyn alan...@hotmail.com wrote: Hi, Just try it.. Is good.. But the Turtle not are smarth enough... The cat yes... :-) Maybe, could have several levels, or at least, an easy and hard.. Please program a more clever turtle for me :) See http://wiki.sugarlabs.org/go/Activities/Turtle_in_a_Pond#Strategy -walter Often when I click an empty field near the turtle, it won't let me. - Bert - ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [ASLO] Release Turtle in a Pond-3
On Wed, Nov 30, 2011 at 1:48 PM, Bert Freudenberg b...@freudenbergs.de wrote: On 30.11.2011, at 19:02, Walter Bender wrote: On Wed, Nov 30, 2011 at 12:41 PM, Alan Jhonn Aguiar Schwyn alan...@hotmail.com wrote: Hi, Just try it.. Is good.. But the Turtle not are smarth enough... The cat yes... :-) Maybe, could have several levels, or at least, an easy and hard.. Please program a more clever turtle for me :) See http://wiki.sugarlabs.org/go/Activities/Turtle_in_a_Pond#Strategy -walter Often when I click an empty field near the turtle, it won't let me. Yeah. I need to fix that. Try clicking a bit farther away from the turtle on the circle and it should always work. I have a fix (that I use in Turrle Art) but have been too lazy to program it in. -walter - Bert - ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [ASLO] Release Turtle in a Pond-3
On Wed, Nov 30, 2011 at 1:48 PM, Bert Freudenberg b...@freudenbergs.de wrote: On 30.11.2011, at 19:02, Walter Bender wrote: On Wed, Nov 30, 2011 at 12:41 PM, Alan Jhonn Aguiar Schwyn alan...@hotmail.com wrote: Hi, Just try it.. Is good.. But the Turtle not are smarth enough... The cat yes... :-) Maybe, could have several levels, or at least, an easy and hard.. Please program a more clever turtle for me :) See http://wiki.sugarlabs.org/go/Activities/Turtle_in_a_Pond#Strategy -walter Often when I click an empty field near the turtle, it won't let me. Fixed in git. I'll push a new version out tonight. -walter - Bert - ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [ASLO] Release Turtle in a Pond-3
Activity Homepage: http://activities.sugarlabs.org/addon/4516 Sugar Platform: 0.82 - 0.96 Download Now: http://activities.sugarlabs.org/downloads/file/27765/turtle_in_a_pond-3.xo Release notes: 3 ENHANCEMENTS: * Improved graphics (turtle is now a turtle) * Error messages from custom strategy appears on toolbar * Reloading strategy starts new game * Improved documentation (tip of the hat to Tony Forster); please see http://wiki.sugarlabs.org/go/Activities/Turtle_in_a_Pond Sugar Labs Activities http://activities.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [ASLO] Release Turtle in a Pond-4
Activity Homepage: http://activities.sugarlabs.org/addon/4516 Sugar Platform: 0.82 - 0.96 Download Now: http://activities.sugarlabs.org/downloads/file/27766/turtle_in_a_pond-4.xo Release notes: 4 ENHANCEMENTS: * More tools for building strategies * Slightly more challenging default behavior for turtle BUG FIX: * Fixed bug with errant button presses Sugar Labs Activities http://activities.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
