Corrections

4 files changed, 46 insertions, 2 deletions

diff --git a/activity.py b/activity.py
index 7fdf2e1..3c5b497 100644
--- a/activity.py
+++ b/activity.py
@@ -39,7 +39,7 @@ except ImportError:
 
 os.environ['DATA_DIR'] = os.path.abspath('./data')
 
-from toolbars import Options
+from options import Options
 from canvas import Canvas
 
 
diff --git a/application.py b/application.py
index db1c802..b8b34bf 100755
--- a/application.py
+++ b/application.py
@@ -30,7 +30,7 @@ glib.set_prgname(appname)
 glib.set_application_name(appname)
 
 import gtk
-from toolbars import Options
+from options import Options
 from canvas import Canvas
 
 this_dir = os.path.split('__file__')[:-1]
diff --git a/makescripts/activity_luncher.py b/makescripts/activity_luncher.py
new file mode 100644
index 0000000..378cf84
--- /dev/null
+++ b/makescripts/activity_luncher.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012 S. Daniel Francis <francis@sugarlabs.org>
+#
+# 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
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+import ConfigParser
+import sys
+import os
+appdir = os.path.abspath('./')
+sys.path.append(appdir)
+
+import info
+
+activity_file_stream = open('activity.info', 'w')
+activity_file = ConfigParser.RawConfigParser()
+activity_file.add_section('Activity')
+activity_file.set('Activity', 'name', info.name)
+activity_file.set('Activity', 'activity_version',
+                  info.version)
+activity_file.set('Activity', 'show_launcher', '1')
+activity_file.set('Activity', 'bundle_id', info.service_name)
+activity_file.set('Activity', 'exec',
+                  'sugar-activity activity.Activity -s')
+activity_file.set('Activity', 'icon', 'activity-' + info.lower_name)
+activity_file.set('Activity', 'license', info.license)
+if info.file_filter_mime:
+    activity_file.set('Activity', 'mime_types', info.file_filter_mime)
+activity_file.write(activity_file_stream)
+activity_file_stream.close()
diff --git a/toolbars.py b/options.py
index 9e06358..9e06358 100644
--- a/toolbars.py
+++ b/options.py