Merge branch 'master' into good
This commit is contained in:
commit
fe53e8c8a7
BIN
gfx/fpdb-cards.png
Normal file
BIN
gfx/fpdb-cards.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.6 KiB |
|
@ -626,7 +626,12 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
|
||||||
self.load_profile()
|
self.load_profile()
|
||||||
|
|
||||||
self.statusIcon = gtk.StatusIcon()
|
self.statusIcon = gtk.StatusIcon()
|
||||||
self.statusIcon.set_from_stock(gtk.STOCK_HOME)
|
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.set_tooltip("Free Poker Database")
|
||||||
self.statusIcon.connect('activate', self.statusicon_activate)
|
self.statusIcon.connect('activate', self.statusicon_activate)
|
||||||
self.statusMenu = gtk.Menu()
|
self.statusMenu = gtk.Menu()
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -15,7 +15,9 @@ setup(name = 'fpdb',
|
||||||
['docs/readme.txt', 'docs/release-notes.txt',
|
['docs/readme.txt', 'docs/release-notes.txt',
|
||||||
'docs/tabledesign.html', 'THANKS.txt']),
|
'docs/tabledesign.html', 'THANKS.txt']),
|
||||||
('/usr/share/pixmaps',
|
('/usr/share/pixmaps',
|
||||||
['gfx/fpdb-icon.png']),
|
['gfx/fpdb-icon.png', 'gfx/fpdb-icon2.png',
|
||||||
|
'gfx/fpdb-cards.png'
|
||||||
|
]),
|
||||||
('/usr/share/applications',
|
('/usr/share/applications',
|
||||||
['files/fpdb.desktop']),
|
['files/fpdb.desktop']),
|
||||||
('/usr/share/python-fpdb',
|
('/usr/share/python-fpdb',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user