Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAgustin Zubiaga <aguz@sugarlabs.org>2012-12-28 05:07:01 (GMT)
committer Agustin Zubiaga <aguz@sugarlabs.org>2012-12-28 05:07:01 (GMT)
commit0eb9604a00f86b5dd993c013a2e17952848b4fa7 (patch)
tree065fd78fc145d01f7346c95562c3eca46c90cf0a
parent0ae6dfc144acb7c3f731fd8b5f965420d2921ca3 (diff)
Cambio de nombre
Signed-off-by: Agustin Zubiaga <aguz@sugarlabs.org>
-rw-r--r--activity.py15
-rw-r--r--activity/activity.info6
2 files changed, 13 insertions, 8 deletions
diff --git a/activity.py b/activity.py
index 92cb0c8..a4fd154 100644
--- a/activity.py
+++ b/activity.py
@@ -69,7 +69,7 @@ grades = [('Tercer grado',
]
-class HNDViewer(activity.Activity):
+class UnitBrowser(activity.Activity):
buffers = {}
@@ -77,6 +77,7 @@ class HNDViewer(activity.Activity):
activity.Activity.__init__(self, handle, True)
self.max_participants = 1
+ self._wait_for_complete = False
# Toolbar
toolbarbox = ToolbarBox()
@@ -138,8 +139,8 @@ class HNDViewer(activity.Activity):
self._browser = WebKit.WebView()
self._browser.connect('load-finished', self._load_finished_cb)
self._browser.set_full_content_zoom(True)
- self._browser.set_zoom_level(
- self._browser.get_zoom_level() + 0.3)
+ #self._browser.set_zoom_level(
+ # self._browser.get_zoom_level() + 0.3)
self._notebook.append_page(self._browser, Gtk.Label())
self.set_canvas(self._notebook)
@@ -190,10 +191,14 @@ class HNDViewer(activity.Activity):
iter_ = widget.get_model().get_iter(widget.get_selected_items()[0])
unit = widget.get_model().get(iter_, 2)[0]
self._browser.open(ACTIVITIES_URL + unit)
- self._notebook.set_current_page(1)
- return True
+ self._wait_for_complete = True
def _load_finished_cb(self, widget, frame):
if widget.props.uri.endswith('index.html'):
self._show_activities_list()
+
+ else:
+ if self._wait_for_complete:
+ self._notebook.set_current_page(1)
+ self._wait_for_complete = False
diff --git a/activity/activity.info b/activity/activity.info
index 14bbe6a..3b94bfa 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,7 @@
[Activity]
-name = HNDViewer
+name = Navegador de Actividades
activity_version = 1
-bundle_id = org.laptop.HNDViewer
-exec = sugar-activity activity.HNDViewer -s
+bundle_id = org.laptop.HndUnitBrowser
+exec = sugar-activity activity.UnitBrowser -s
icon = icon
license = GPLv3+