deleted: MANIFEST

modified:   activity/activity.info
deleted:    iconview.py
deleted:    resizepics.py
modified:   setup.py
modified:   sugarcommander.py
Modify activity.info to add bundle_id.

6 files changed, 17 insertions, 440 deletions

diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index a999911..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,310 +0,0 @@
-sugarcommander.py
-setup.py
-activity/activity.info
-activity/scommander.svg
-po/SugarCommander.pot
-xoimage.jpg
-SugarCommander.e4p
-po/pap.po
-po/tzm.po
-po/ak.po
-po/am.po
-po/ton.po
-po/zh_HK.po
-po/pa.po
-po/ig.po
-po/th.po
-po/sv.po
-po/zh_CN.po
-po/tyv.po
-po/de.po
-po/nb.po
-po/si.po
-po/bn_IN.po
-po/ms.po
-po/bi.po
-po/da.po
-po/ko.po
-po/lt.po
-po/he.po
-po/sq.po
-po/st.po
-po/mr.po
-po/yo.po
-po/kn.po
-po/ml.po
-po/ay.po
-po/vi.po
-po/tzo.po
-po/sm.po
-po/ht.po
-po/fr.po
-po/mn.po
-po/ru.po
-po/ar_SY.po
-po/el.po
-po/mvo.po
-po/tvl.po
-po/sd.po
-po/fa.po
-po/tpi.po
-po/af.po
-po/cs.po
-po/es.po
-po/it.po
-po/dz.po
-po/bg.po
-po/templates.po
-po/sw.po
-po/uk.po
-po/kos.po
-po/ta.po
-po/ca.po
-po/rw.po
-po/sl.po
-po/pt.po
-po/zh_TW.po
-po/bs.po
-po/is.po
-po/nn.po
-po/nl.po
-po/ro.po
-po/wa.po
-po/ur.po
-po/fa_AF.po
-po/id.po
-po/mk.po
-po/cpp.po
-po/fil.po
-po/sr.po
-po/fi.po
-po/ps.po
-po/gu.po
-po/bn.po
-po/pl.po
-po/qu.po
-po/en_US.po
-po/hu.po
-po/ja.po
-po/te.po
-po/sk.po
-po/tr.po
-po/mg.po
-po/pt_BR.po
-po/pis.po
-po/ha.po
-po/hi.po
-po/ug.po
-po/en.po
-po/ff.po
-po/ne.po
-po/en_GB.po
-po/hy.po
-po/ku.po
-po/na.po
-po/lv.po
-po/km.po
-po/ar.po
-po/nah.po
-locale/nl/activity.linfo
-locale/nl/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ha/activity.linfo
-locale/ha/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/en_GB/activity.linfo
-locale/en_GB/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/th/activity.linfo
-locale/th/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ar/activity.linfo
-locale/ar/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ak/activity.linfo
-locale/ak/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/wa/activity.linfo
-locale/wa/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/pis/activity.linfo
-locale/pis/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ru/activity.linfo
-locale/ru/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/tyv/activity.linfo
-locale/tyv/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/zh_CN/activity.linfo
-locale/zh_CN/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/mk/activity.linfo
-locale/mk/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/lv/activity.linfo
-locale/lv/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/mvo/activity.linfo
-locale/mvo/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/mg/activity.linfo
-locale/mg/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/af/activity.linfo
-locale/af/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ca/activity.linfo
-locale/ca/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/pa/activity.linfo
-locale/pa/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/km/activity.linfo
-locale/km/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ht/activity.linfo
-locale/ht/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/bi/activity.linfo
-locale/bi/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/sk/activity.linfo
-locale/sk/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/fr/activity.linfo
-locale/fr/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/te/activity.linfo
-locale/te/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/sl/activity.linfo
-locale/sl/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/yo/activity.linfo
-locale/yo/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/tvl/activity.linfo
-locale/tvl/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/cpp/activity.linfo
-locale/cpp/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/tpi/activity.linfo
-locale/tpi/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/mn/activity.linfo
-locale/mn/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ff/activity.linfo
-locale/ff/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/tr/activity.linfo
-locale/tr/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/tzo/activity.linfo
-locale/tzo/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/es/activity.linfo
-locale/es/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/rw/activity.linfo
-locale/rw/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ig/activity.linfo
-locale/ig/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/zh_TW/activity.linfo
-locale/zh_TW/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/nn/activity.linfo
-locale/nn/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/el/activity.linfo
-locale/el/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/is/activity.linfo
-locale/is/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/it/activity.linfo
-locale/it/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ja/activity.linfo
-locale/ja/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/kn/activity.linfo
-locale/kn/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/bs/activity.linfo
-locale/bs/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/cs/activity.linfo
-locale/cs/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/fa_AF/activity.linfo
-locale/fa_AF/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/na/activity.linfo
-locale/na/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ro/activity.linfo
-locale/ro/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ug/activity.linfo
-locale/ug/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ton/activity.linfo
-locale/ton/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ur/activity.linfo
-locale/ur/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/pt/activity.linfo
-locale/pt/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/sw/activity.linfo
-locale/sw/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/dz/activity.linfo
-locale/dz/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/sv/activity.linfo
-locale/sv/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ml/activity.linfo
-locale/ml/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/vi/activity.linfo
-locale/vi/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/de/activity.linfo
-locale/de/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/pl/activity.linfo
-locale/pl/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/sm/activity.linfo
-locale/sm/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/templates/activity.linfo
-locale/templates/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/kos/activity.linfo
-locale/kos/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/lt/activity.linfo
-locale/lt/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/bn_IN/activity.linfo
-locale/bn_IN/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ms/activity.linfo
-locale/ms/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/nb/activity.linfo
-locale/nb/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ay/activity.linfo
-locale/ay/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/fi/activity.linfo
-locale/fi/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ku/activity.linfo
-locale/ku/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ne/activity.linfo
-locale/ne/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/hi/activity.linfo
-locale/hi/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/uk/activity.linfo
-locale/uk/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/bn/activity.linfo
-locale/bn/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/sq/activity.linfo
-locale/sq/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ar_SY/activity.linfo
-locale/ar_SY/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/he/activity.linfo
-locale/he/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/sd/activity.linfo
-locale/sd/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/pt_BR/activity.linfo
-locale/pt_BR/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/nah/activity.linfo
-locale/nah/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ps/activity.linfo
-locale/ps/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/zh_HK/activity.linfo
-locale/zh_HK/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/pap/activity.linfo
-locale/pap/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/en/activity.linfo
-locale/en/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/fa/activity.linfo
-locale/fa/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/gu/activity.linfo
-locale/gu/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/qu/activity.linfo
-locale/qu/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/st/activity.linfo
-locale/st/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/tzm/activity.linfo
-locale/tzm/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/hu/activity.linfo
-locale/hu/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/en_US/activity.linfo
-locale/en_US/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/am/activity.linfo
-locale/am/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/si/activity.linfo
-locale/si/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ta/activity.linfo
-locale/ta/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/sr/activity.linfo
-locale/sr/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/ko/activity.linfo
-locale/ko/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/da/activity.linfo
-locale/da/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/id/activity.linfo
-locale/id/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/mr/activity.linfo
-locale/mr/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/fil/activity.linfo
-locale/fil/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/bg/activity.linfo
-locale/bg/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
-locale/hy/activity.linfo
-locale/hy/LC_MESSAGES/org.laptop.sugar.SugarCommander.mo
diff --git a/activity/activity.info b/activity/activity.info
index f7f075b..93961c4 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,8 +1,9 @@
 [Activity]
 name = Sugar Commander
-service_name = org.laptop.sugar.SugarCommander
+bundle_id = org.laptop.sugar.SugarCommander
 icon = scommander
 exec = sugar-activity sugarcommander.SugarCommander
 show_launcher = yes
-activity_version = 8
+activity_version = 9
 license = GPLv2+
+summary = Move files from your SD card or thumb drives to the Journal, clean up the Journal, and more!
diff --git a/iconview.py b/iconview.py
deleted file mode 100755
index a8c273a..0000000
--- a/iconview.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /usr/bin/env python
-
-import pygtk
-pygtk.require('2.0')
-
-import getopt
-import sys
-import gtk
-import gtk.gdk
-
-def extract_filename(filename):
-    partition_tuple = filename.rpartition('/')
-    return partition_tuple[2]
-
-def make_iconview(args):
-    # First create an iconview
-    view = gtk.IconView()
-
-    # Create a store for our iconview and fill it with stock icons
-    store = gtk.ListStore(str, gtk.gdk.Pixbuf)
-    i = 0
-    while i < len(args):
-        scaled_pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(args[i], 160, 120)
-        filename = extract_filename(args[i])
-        store.append(['%s' % filename, scaled_pixbuf])
-        i = i + 1
-
-    # Connect our iconview with our store
-    view.set_model(store)
-    # Map store text and pixbuf columns to iconview
-    view.set_text_column(0)
-    view.set_pixbuf_column(1)
-
-    # Pack our iconview into a scrolled window
-    swin = gtk.ScrolledWindow()
-    swin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-    swin.add_with_viewport(view)
-    swin.show_all()
-
-    # pack the scrolled window into a simple dialog and run it
-    dialog = gtk.Dialog('IconView Demo')
-    close = dialog.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_NONE)
-    dialog.set_default_size(1024,800)
-    dialog.vbox.pack_start(swin)
-    dialog.run()
-
-if __name__ == "__main__":
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], "")
-        make_iconview(args)
-    except getopt.error, msg:
-        print msg
-        print "This program has no options"
-        sys.exit(2)
diff --git a/resizepics.py b/resizepics.py
deleted file mode 100755
index 23cee7e..0000000
--- a/resizepics.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /usr/bin/env python
-
-# Copyright (C) 2010 James D. Simmons
-#
-# 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 2 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 St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import getopt
-import sys
-import os
-import gtk
-import pygame
-
-SCREEN_WIDTH = 1200
-ARBITRARY_LARGE_HEIGHT = 10000
-JPEG_QUALITY = 90
-
-def resize_image(filename):
-
-    print '%s file size before conversion: %d KB' %  (filename, os.stat(filename).st_size / 1024)
-    im = pygame.image.load(filename)
-    image_width, image_height = im.get_size()
-    print '%s image size before conversion: %d x %d' %  (filename,   image_width,  image_height)
-    resize_to_width = SCREEN_WIDTH
-    if image_width <= SCREEN_WIDTH:
-        resize_to_width = image_width
-    try:
-        scaled_pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(filename, resize_to_width, ARBITRARY_LARGE_HEIGHT)
-        scaled_pixbuf.save(filename, "jpeg", {"quality":"%d" % JPEG_QUALITY})
-    except:
-        print 'File could not be converted'
-    print '%s file size after conversion %d KB' % (filename, os.stat(filename).st_size /1024)
-    im = pygame.image.load(filename)
-    image_width, image_height = im.get_size()
-    print '%s image size after conversion: %d x %d' % (filename,  image_width,  image_height)
-    print ''
-    return
-
-if __name__ == "__main__":
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], "")
-        i = 0
-        while i < len(args):
-            success = resize_image(args[i])
-            i = i + 1
-    except getopt.error, msg:
-        print msg
-        print "This program has no options"
-        sys.exit(2)
diff --git a/setup.py b/setup.py
index d3ab3a3..c60f4d0 100755
--- a/setup.py
+++ b/setup.py
@@ -1,21 +1,21 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2006, Red Hat, Inc.

+# Copyright (C) 2006, Red Hat, Inc.
 #
-# 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 2 of the License, or

-# (at your option) any later version.

+# 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 2 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.

+# 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 St, Fifth Floor, Boston, MA  02110-1301  USA

+# 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 St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from sugar.activity import bundlebuilder
+from sugar3.activity import bundlebuilder
 
 bundlebuilder.start()
diff --git a/sugarcommander.py b/sugarcommander.py
index daf46f3..7e60e06 100755
--- a/sugarcommander.py
+++ b/sugarcommander.py
@@ -1,6 +1,6 @@
 # SugarCommander.py
 
-# Copyright (C) 2010 James D. Simmons
+# Copyright (C) 2010 James D. Simmons <nicestep@gmail.com>
 #
 # 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