diff --git a/ChangeLog b/ChangeLog index 89f15ea9..4b68b00f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon, 4 Dec 2006 14:04:04 +0100 + * setup.py: Copy gPodder icon(s) to share/pixmaps now, and + only the artwork files to share/gpodder/images + * Makefile: Generate 22x22 and 48x48 icons from gpodder.png + * README: Note "imagemagick" as new developer dependency - + this is needed for the new image conversion in Makefile + * data/gpodder.glade: Added three new links to help menu + * src/gpodder/gpodder.py: Added three new link handlers for + help menu to link to website, wishlist and mailing list + Sun, 3 Dec 2006 19:07:27 +0100 * src/gpodder/libwget.py: Remove partially downloaded files after download is cancelled or an error occured diff --git a/Makefile b/Makefile index 88e9ca0e..4392381f 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ GLADEFILE=data/gpodder.glade GLADEGETTEXT=$(GLADEFILE).h MESSAGESPOT=data/messages.pot GUIFILE=src/gpodder/gpodder.py +LOGO=data/gpodder.png +LOGO_48=data/gpodder-48x48.png +LOGO_22=data/gpodder-22x22.png MANPAGE=doc/man/gpodder.1 TEPACHE=./doc/dev/tepache GPODDERVERSION=`cat $(BINFILE) |grep ^__version__.*=|cut -d\" -f2` @@ -35,7 +38,7 @@ help: @echo 'make release create source tarball in "dist/"' @echo 'make install install gpodder into "/usr/"' @echo 'make uninstall uninstall gpodder from "/usr/"' - @echo 'make generators re-generate manpage and run tepache' + @echo 'make generators generate manpage, run tepache and resize logo' @echo 'make messages rebuild messages.pot from new source' @echo 'make clean remove generated+temp+*.pyc files' @echo 'make distclean do a "make clean" + remove "dist/"' @@ -72,11 +75,11 @@ uninstall: @echo "# REMOVE FILES INSTALLED BY GPODDER. WATCH INSTALL PROCESS AND REMOVE #" @echo "# THE REST OF THE PACKAGES MANUALLY TO COMPLETELY REMOVE GPODDER. #" @echo "##########################################################################" - rm -rf /usr/share/gpodder /usr/share/applications/gpodder.desktop /usr/share/man/man1/gpodder.man.1 /usr/bin/gpodder /usr/lib/python?.?/site-packages/gpodder/ /usr/share/locale/*/LC_MESSAGES/gpodder.mo + rm -rf /usr/share/gpodder /usr/share/pixmaps/gpodder* /usr/share/applications/gpodder.desktop /usr/share/man/man1/gpodder.man.1 /usr/bin/gpodder /usr/lib/python?.?/site-packages/gpodder/ /usr/share/locale/*/LC_MESSAGES/gpodder.mo ########################################################################## -generators: $(MANPAGE) gen_glade +generators: $(MANPAGE) gen_glade gen_graphics make -C data/po update messages: gen_gettext @@ -92,6 +95,10 @@ gen_gettext: $(MESSAGESPOT) make -C data/po generators make -C data/po update +gen_graphics: + convert $(LOGO) -resize 22x22 $(LOGO_22) + convert $(LOGO) -resize 48x48 $(LOGO_48) + $(GLADEGETTEXT): $(GLADEFILE) intltool-extract --type=gettext/glade $(GLADEFILE) @@ -103,7 +110,7 @@ $(MESSAGESPOT): src/gpodder/*.py $(GLADEGETTEXT) $(BINFILE) clean: python setup.py clean - rm -f src/gpodder/*.pyc src/gpodder/*.bak MANIFEST PKG-INFO data/gpodder.gladep{,.bak} data/gpodder.glade.bak $(GLADEGETTEXT) data/messages.pot~ + rm -f src/gpodder/*.pyc src/gpodder/*.bak MANIFEST PKG-INFO data/gpodder.gladep{,.bak} data/gpodder.glade.bak $(GLADEGETTEXT) data/messages.pot~ data/gpodder-??x??.png rm -rf build make -C data/po clean @@ -115,7 +122,7 @@ distclean: clean ########################################################################## -.PHONY: all cl test release install generators gen_manpage gen_glade clean distclean messages help +.PHONY: all cl test release install generators gen_manpage gen_glade gen_graphics clean distclean messages help ########################################################################## diff --git a/README b/README index 5d13228f..b4726957 100644 --- a/README +++ b/README @@ -76,7 +76,7 @@ If you want to install gPodder from source, you have to get the following packages: - apt-get install help2man python-dev intltool + apt-get install help2man python-dev intltool imagemagick Debian developers should install these additional packages: diff --git a/data/gpodder.glade b/data/gpodder.glade index 4110b518..673d9f7d 100644 --- a/data/gpodder.glade +++ b/data/gpodder.glade @@ -13,6 +13,7 @@ 450 True False + gpodder-48x48.png True False False @@ -41,7 +42,7 @@ True - + True gtk-cdrom 1 @@ -63,7 +64,7 @@ - + True gtk-refresh 1 @@ -90,7 +91,7 @@ - + True gtk-save 1 @@ -111,7 +112,7 @@ - + True gtk-delete 1 @@ -138,7 +139,7 @@ - + True gtk-preferences 1 @@ -165,7 +166,7 @@ - + True gtk-quit 1 @@ -189,7 +190,7 @@ True - + True gtk-justify-left 1 @@ -211,7 +212,7 @@ - + True gtk-open 1 @@ -232,7 +233,7 @@ - + True gtk-edit 1 @@ -253,7 +254,7 @@ - + True gtk-delete 1 @@ -280,7 +281,7 @@ - + True gtk-save-as 1 @@ -301,7 +302,7 @@ - + True gtk-redo 1 @@ -325,7 +326,7 @@ True - + True gtk-help 1 @@ -339,6 +340,81 @@ + + + True + gPodder website + True + + + + + True + gtk-home + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + + + + True + Author's wishlist + True + + + + + True + gtk-edit + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + gPodder mailing list + True + + + + + True + gtk-find + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + True @@ -347,7 +423,7 @@ - + True gtk-about 1 diff --git a/setup.py b/setup.py index 17950635..508319d1 100644 --- a/setup.py +++ b/setup.py @@ -38,15 +38,17 @@ for l in languages: # files to install inst_manpages = glob.glob( 'doc/man/*.1') -inst_images = [ 'data/gpodder.png' ] + glob.glob('data/artwork/*') +inst_images = glob.glob('data/artwork/*') +inst_icons = [ 'data/gpodder.png' ] + glob.glob('data/gpodder-??x??.png') inst_share = [ 'data/gpodder.glade' ] -inst_icons = [ 'data/gpodder.desktop' ] +inst_desktop = [ 'data/gpodder.desktop' ] data_files = [ ('share/man/man1', inst_manpages), ('share/gpodder/images', inst_images), ('share/gpodder', inst_share), - ('share/applications', inst_icons), + ('share/applications', inst_desktop), + ('share/pixmaps', inst_icons), ] setup( diff --git a/src/gpodder/gpodder.py b/src/gpodder/gpodder.py index 4eb0403b..fe36ef06 100644 --- a/src/gpodder/gpodder.py +++ b/src/gpodder/gpodder.py @@ -568,6 +568,21 @@ class Gpodder(SimpleGladeApp): opml_lister.get_channels_from_url( url, self.add_new_channel) #-- Gpodder.on_itemImportChannels_activate } + #-- Gpodder.on_homepage_activate { + def on_homepage_activate(self, widget, *args): + os.system( 'gnome-open http://perli.net/projekte/gpodder/') + #-- Gpodder.on_homepage_activate } + + #-- Gpodder.on_wishlist_activate { + def on_wishlist_activate(self, widget, *args): + os.system( 'gnome-open http://www.amazon.de/gp/registry/2PD2MYGHE6857') + #-- Gpodder.on_wishlist_activate } + + #-- Gpodder.on_mailinglist_activate { + def on_mailinglist_activate(self, widget, *args): + os.system( 'gnome-open http://lists.berlios.de/mailman/listinfo/gpodder-devel') + #-- Gpodder.on_mailinglist_activate } + #-- Gpodder.on_itemAbout_activate { def on_itemAbout_activate(self, widget, *args): dlg = gtk.AboutDialog() @@ -578,12 +593,12 @@ class Gpodder(SimpleGladeApp): dlg.set_website( app_website) dlg.set_translator_credits( _('translator-credits')) dlg.connect("response", self.on_aboutDialog_response) - # + try: - dlg.set_logo( gtk.gdk.pixbuf_new_from_file_at_size( icon_dir, 164, 164)) + dlg.set_logo( gtk.gdk.pixbuf_new_from_file_at_size( icon_dir, 200, 200)) except: None - # + dlg.run() #-- Gpodder.on_itemAbout_activate } diff --git a/src/gpodder/gpodder.py.orig b/src/gpodder/gpodder.py.orig index 3e70e9f7..a1c5014f 100644 --- a/src/gpodder/gpodder.py.orig +++ b/src/gpodder/gpodder.py.orig @@ -90,6 +90,21 @@ class Gpodder(SimpleGladeApp): print "on_itemImportChannels_activate called with self.%s" % widget.get_name() #-- Gpodder.on_itemImportChannels_activate } + #-- Gpodder.on_homepage_activate { + def on_homepage_activate(self, widget, *args): + print "on_homepage_activate called with self.%s" % widget.get_name() + #-- Gpodder.on_homepage_activate } + + #-- Gpodder.on_wishlist_activate { + def on_wishlist_activate(self, widget, *args): + print "on_wishlist_activate called with self.%s" % widget.get_name() + #-- Gpodder.on_wishlist_activate } + + #-- Gpodder.on_mailinglist_activate { + def on_mailinglist_activate(self, widget, *args): + print "on_mailinglist_activate called with self.%s" % widget.get_name() + #-- Gpodder.on_mailinglist_activate } + #-- Gpodder.on_itemAbout_activate { def on_itemAbout_activate(self, widget, *args): print "on_itemAbout_activate called with self.%s" % widget.get_name()