Switching to a new icon that is only slightly better

diff --git a/Makefile b/Makefile
index e1897c6..eed5e40 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,8 +67,8 @@ package: $(OBJ) build_mo
        $(foreach file, $(LOCALE_FILES), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
        cp data/$(PROJECT_NAME).desktop $(BUILD_PATH)/generic
        cp data/icons/26_$(PROJECT_NAME).png $(BUILD_PATH)/generic/26x26-$(PROJECT_NAME).png
-       cp data/icons/40_$(PROJECT_NAME).png $(BUILD_PATH)/generic/40x40-$(PROJECT_NAME).png
-       cp data/icons/64_$(PROJECT_NAME).png $(BUILD_PATH)/generic/scale-$(PROJECT_NAME).png
+       cp data/icons/32_$(PROJECT_NAME).png $(BUILD_PATH)/generic/32x32-$(PROJECT_NAME).png
+       cp data/icons/48_$(PROJECT_NAME).png $(BUILD_PATH)/generic/48x48-$(PROJECT_NAME).png
        cp support/builddeb.py $(BUILD_PATH)/generic
        cp support/py2deb.py $(BUILD_PATH)/generic
        cp support/fake_py2deb.py $(BUILD_PATH)/generic

diff --git a/data/icons/26_multilist.png b/data/icons/26_multilist.png
index d978b6d..74da4c9 100644 (file)
Binary files a/data/icons/26_multilist.png and b/data/icons/26_multilist.png differ

diff --git a/data/icons/32_multilist.png b/data/icons/32_multilist.png
new file mode 100644 (file)
index 0000000..33af038
Binary files /dev/null and b/data/icons/32_multilist.png differ

diff --git a/data/icons/40_multilist.png b/data/icons/40_multilist.png
deleted file mode 100644 (file)
index a62085d..0000000
Binary files a/data/icons/40_multilist.png and /dev/null differ

diff --git a/data/icons/48_multilist.png b/data/icons/48_multilist.png
new file mode 100644 (file)
index 0000000..5519859
Binary files /dev/null and b/data/icons/48_multilist.png differ

diff --git a/data/icons/64_multilist.png b/data/icons/64_multilist.png
deleted file mode 100644 (file)
index 6caa276..0000000
Binary files a/data/icons/64_multilist.png and /dev/null differ

diff --git a/data/icons/LICENSE b/data/icons/LICENSE
new file mode 100644 (file)
index 0000000..67c4928
--- /dev/null
+++ b/data/icons/LICENSE
@@ -0,0 +1,4 @@
+Checklist Icon:
+By WooThemes
+GPL
+http://www.woothemes.com/2010/08/woocons1/

diff --git a/src/multilist_gtk.py b/src/multilist_gtk.py
index 9d78195..11a9aff 100755 (executable)
--- a/src/multilist_gtk.py
+++ b/src/multilist_gtk.py
@@ -599,8 +599,8 @@ class Multilist(hildonize.get_app_class()):
                dialog.set_name(constants.__pretty_app_name__)
                dialog.set_version(constants.__version__)
                dialog.set_copyright("")
-               dialog.set_website("http://axique.de/f = Multilist")
-               comments = "%s is a program to handle multiple lists." % constants.__pretty_app_name__
+               dialog.set_website("http://multilist.garage.maemo.org")
+               comments = "%s is a program to handle multiple lists.  For licensing on the icon, see the website." % constants.__pretty_app_name__
                dialog.set_comments(comments)
                dialog.set_authors(["Christoph Wurstle <n800@axique.net>", "Ed Page <eopage@byu.net> (Blame him for the most recent bugs)"])
                dialog.run()

diff --git a/support/builddeb.py b/support/builddeb.py
index 315e9e7..0171b46 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -96,7 +96,7 @@ def build_package(distribution):
        p.icon = {
                "debian": "26x26-multilist.png",
                "diablo": "26x26-multilist.png",
-               "fremantle": "40x40-multilist.png", # Fremantle natively uses 48x48
+               "fremantle": "48x48-multilist.png", # Fremantle natively uses 48x48
        }[distribution]
        p["/usr/bin"] = [ "multilist.py" ]
        for relPath, files in unflatten_files(find_files(".", "locale")).iteritems():
@@ -117,8 +117,8 @@ def build_package(distribution):
                )
        p["/usr/share/applications/hildon"] = ["multilist.desktop"]
        p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-multilist.png|multilist.png"]
-       p["/usr/share/icons/hicolor/40x40/hildon"] = ["40x40-multilist.png|multilist.png"]
-       p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-multilist.png|multilist.png"]
+       p["/usr/share/icons/hicolor/32x32/hildon"] = ["32x32-multilist.png|multilist.png"]
+       p["/usr/share/icons/hicolor/48x48/hildon"] = ["48x48-multilist.png|multilist.png"]
 
        if distribution == "debian":
                print p