Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristhofer Travieso <cristhofer@localhost.localdomain>2013-03-05 23:37:01 (GMT)
committer Cristhofer Travieso <cristhofer@localhost.localdomain>2013-03-05 23:37:01 (GMT)
commit7f6eb4adb27a08d9c3b5a238108eda9f57e74ae5 (patch)
tree9d409b1ba5c49b30620f69f6a4ad2b4cfcc0aaba
parent9d40682fd1c073d74c655edc16f7be8ec96a0c7b (diff)
Add font toolbox
Signed-off-by: Cristhofer Travieso <cristhofer@localhost.localdomain>
-rw-r--r--.gitignore1
-rw-r--r--activity.py25
-rw-r--r--activity/activity.info7
-rw-r--r--icons/font.svg (renamed from icons/fuente.svg)0
4 files changed, 19 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index 348a549..07febc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
*.pyo
*.mo
*~
+#*#
TODO
diff --git a/activity.py b/activity.py
index ea1d564..db3683f 100644
--- a/activity.py
+++ b/activity.py
@@ -18,14 +18,14 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-import Gtk
+from gi.repository import Gtk
-from sugar.activity import activity
-from sugar.graphics.toolbarbox import ToolbarBox
-from sugar.activity.widgets import ActivityToolbarButton
-from sugar.activity.widgets import StopButton
+from sugar3.activity import activity
+from sugar3.graphics.toolbarbox import ToolbarBox
+from sugar3.activity.widgets import ActivityToolbarButton
+from sugar3.activity.widgets import StopButton
from sugar3.activity.widgets import ToolbarButton
-from sugar.graphics.toolbutton import ToolButton
+from sugar3.graphics.toolbutton import ToolButton
from canvas import Canvas
@@ -45,17 +45,20 @@ class Electricity(activity.Activity):
activity_button = ActivityToolbarButton(self)
toolbarbox.toolbar.insert(activity_button, 0)
- play_btn = ToolButton()
- toolbarbox.toolbar.insert(play_btn, -1)
-
- self._fonts_button = ToolbarButton(icon_name='preferences-system')
+ self._fonts_button = ToolbarButton(icon_name='font')
fonts_toolbar = Gtk.Toolbar()
self._fonts_button.props.page = fonts_toolbar
toolbarbox.toolbar.insert(self._fonts_button, -1)
stop_btn = StopButton(self)
- toolbarbox.toolbar.inster(stop_button, -1)
+ toolbarbox.toolbar.insert(stop_btn, -1)
+
+ separator = Gtk.SeparatorToolItem()
+ separator.props.draw = False
+ separator.set_size_request(0, -1)
+ separator.set_expand(True)
+ toolbarbox.toolbar.insert(separator, -1)
canvas = Canvas()
self.set_canvas(canvas)
diff --git a/activity/activity.info b/activity/activity.info
index 63e473b..3a545c3 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,8 @@
[Activity]
name = Electricity
activity_version = 1
-bundle_id = org.sugarlabs.Electricity
-exec = sugar-activity -s
+bundle_id = org.laptop.Electricity
+exec = sugar-activity activity.Electricity
icon = icon
-license = GPLv3+
+license = GPLv3
+summary = Create your electric circuit
diff --git a/icons/fuente.svg b/icons/font.svg
index f2bec73..f2bec73 100644
--- a/icons/fuente.svg
+++ b/icons/font.svg