Merge branch 'master' of git://repo.or.cz/fpbd-bostik

This commit is contained in:
Worros 2009-10-28 00:20:26 +08:00
commit 69ece6eeba
5 changed files with 19 additions and 3 deletions

BIN
gfx/fpdb-cards.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -1,3 +1,9 @@
free-poker-tools (0.12-1) unstable; urgency=low
* New release
-- Mika Bostrom <bostik+fpdb@bostik.iki.fi> Mon, 26 Oct 2009 17:49:07 +0200
free-poker-tools (0.11.3+git20091023) unstable; urgency=low
* Snapshot release

View File

@ -128,6 +128,9 @@ class HUD_main(object):
gtk.gdk.threads_enter()
try: # TODO: seriously need to decrease the scope of this block.. what are we expecting to error?
# TODO: The purpose of this try/finally block is to make darn sure that threads_leave()
# TODO: gets called. If there is an exception and threads_leave() doesn't get called we
# TODO: lock up. REB
newlabel = gtk.Label("%s - %s" % (table.site, table_name))
self.vb.add(newlabel)
newlabel.show()

View File

@ -626,6 +626,11 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
self.load_profile()
self.statusIcon = gtk.StatusIcon()
if os.path.exists('../gfx/fpdb-cards.png'):
self.statusIcon.set_from_file('../gfx/fpdb-cards.png')
elif os.path.exists('/usr/share/pixmaps/fpdb-cards.png'):
self.statusIcon.set_from_file('/usr/share/pixmaps/fpdb-cards.png')
else:
self.statusIcon.set_from_stock(gtk.STOCK_HOME)
self.statusIcon.set_tooltip("Free Poker Database")
self.statusIcon.connect('activate', self.statusicon_activate)

View File

@ -5,7 +5,7 @@ from distutils.core import setup
setup(name = 'fpdb',
description = 'Free Poker Database',
version = '0.11.3',
version = '0.12',
author = 'FPDB team',
author_email = 'fpdb-main@lists.sourceforge.net',
packages = ['fpdb'],
@ -15,7 +15,9 @@ setup(name = 'fpdb',
['docs/readme.txt', 'docs/release-notes.txt',
'docs/tabledesign.html', 'THANKS.txt']),
('/usr/share/pixmaps',
['gfx/fpdb-icon.png']),
['gfx/fpdb-icon.png', 'gfx/fpdb-icon2.png',
'gfx/fpdb-cards.png'
]),
('/usr/share/applications',
['files/fpdb.desktop']),
('/usr/share/python-fpdb',