maryjane
/
gpodder
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

help menu links, image conversion 

git-svn-id: svn://svn.berlios.de/gpodder/trunk@189 b0d088ad-0a06-0410-aad2-9ed5178a7e87
This commit is contained in:
Thomas Perl 2006-12-04 13:06:42 +00:00
parent c10d99996c
commit 8883884834
7 changed files with 151 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Mon, 4 Dec 2006 14:04:04 +0100 <thp@perli.net>
* 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 <thp@perli.net>
* src/gpodder/libwget.py: Remove partially downloaded files
after download is cancelled or an error occured

17
Makefile
View File

@ -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
##########################################################################

2
README
View File

@ -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:

104
data/gpodder.glade
View File

@ -13,6 +13,7 @@
<property name="default_height">450</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="icon">gpodder-48x48.png</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
@ -41,7 +42,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image383">
<widget class="GtkImage" id="image613">
<property name="visible">True</property>
<property name="stock">gtk-cdrom</property>
<property name="icon_size">1</property>
@ -63,7 +64,7 @@
<signal name="activate" handler="on_itemUpdate_activate" last_modification_time="Sat, 29 Oct 2005 11:28:10 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image384">
<widget class="GtkImage" id="image614">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@ -90,7 +91,7 @@
<signal name="activate" handler="on_sync_to_ipod_activate" last_modification_time="Wed, 05 Apr 2006 21:49:38 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image385">
<widget class="GtkImage" id="image615">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
@ -111,7 +112,7 @@
<signal name="activate" handler="on_cleanup_ipod_activate" last_modification_time="Wed, 05 Apr 2006 22:14:51 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image386">
<widget class="GtkImage" id="image616">
<property name="visible">True</property>
<property name="stock">gtk-delete</property>
<property name="icon_size">1</property>
@ -138,7 +139,7 @@
<signal name="activate" handler="on_itemPreferences_activate" last_modification_time="Sat, 29 Oct 2005 11:29:01 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image387">
<widget class="GtkImage" id="image617">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@ -165,7 +166,7 @@
<signal name="activate" handler="close_gpodder" last_modification_time="Sat, 29 Oct 2005 11:54:31 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image388">
<widget class="GtkImage" id="image618">
<property name="visible">True</property>
<property name="stock">gtk-quit</property>
<property name="icon_size">1</property>
@ -189,7 +190,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image389">
<widget class="GtkImage" id="image619">
<property name="visible">True</property>
<property name="stock">gtk-justify-left</property>
<property name="icon_size">1</property>
@ -211,7 +212,7 @@
<signal name="activate" handler="on_itemAddChannel_activate" last_modification_time="Sat, 29 Oct 2005 11:33:59 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image390">
<widget class="GtkImage" id="image620">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@ -232,7 +233,7 @@
<signal name="activate" handler="on_itemEditChannel_activate" last_modification_time="Sat, 29 Oct 2005 11:34:38 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image391">
<widget class="GtkImage" id="image621">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
@ -253,7 +254,7 @@
<signal name="activate" handler="on_itemRemoveChannel_activate" last_modification_time="Sat, 29 Oct 2005 11:35:16 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image392">
<widget class="GtkImage" id="image622">
<property name="visible">True</property>
<property name="stock">gtk-delete</property>
<property name="icon_size">1</property>
@ -280,7 +281,7 @@
<signal name="activate" handler="on_itemExportChannels_activate" last_modification_time="Sat, 29 Oct 2005 11:37:45 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image393">
<widget class="GtkImage" id="image623">
<property name="visible">True</property>
<property name="stock">gtk-save-as</property>
<property name="icon_size">1</property>
@ -301,7 +302,7 @@
<signal name="activate" handler="on_itemImportChannels_activate" last_modification_time="Tue, 13 Jun 2006 19:39:42 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image394">
<widget class="GtkImage" id="image624">
<property name="visible">True</property>
<property name="stock">gtk-redo</property>
<property name="icon_size">1</property>
@ -325,7 +326,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image395">
<widget class="GtkImage" id="image625">
<property name="visible">True</property>
<property name="stock">gtk-help</property>
<property name="icon_size">1</property>
@ -339,6 +340,81 @@
<child>
<widget class="GtkMenu" id="menuHelp_menu">
<child>
<widget class="GtkImageMenuItem" id="homepage">
<property name="visible">True</property>
<property name="label" translatable="yes">gPodder website</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_homepage_activate" last_modification_time="Mon, 04 Dec 2006 12:08:55 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image626">
<property name="visible">True</property>
<property name="stock">gtk-home</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator3">
<property name="visible">True</property>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="wishlist">
<property name="visible">True</property>
<property name="label" translatable="yes">Author's wishlist</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_wishlist_activate" last_modification_time="Mon, 04 Dec 2006 12:06:32 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image627">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="mailinglist">
<property name="visible">True</property>
<property name="label" translatable="yes">gPodder mailing list</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_mailinglist_activate" last_modification_time="Mon, 04 Dec 2006 12:12:24 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image628">
<property name="visible">True</property>
<property name="stock">gtk-find</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator1">
<property name="visible">True</property>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="itemAbout">
<property name="visible">True</property>
@ -347,7 +423,7 @@
<signal name="activate" handler="on_itemAbout_activate" last_modification_time="Sat, 29 Oct 2005 11:40:19 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image396">
<widget class="GtkImage" id="image629">
<property name="visible">True</property>
<property name="stock">gtk-about</property>
<property name="icon_size">1</property>

8
setup.py
View File

@ -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(

21
src/gpodder/gpodder.py
View File

@ -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 }

15
src/gpodder/gpodder.py.orig
View File

@ -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()