From 6ec309a68515de954300d96e67de91d2d1efcb93 Mon Sep 17 00:00:00 2001 From: Mika Bostrom Date: Thu, 22 Oct 2009 08:44:45 +0300 Subject: [PATCH] Provide extra path for mucked cards image Modified: * Mucked.py When running from outside source tree, the image containing mucked cards' faces could not be loaded. Provide an extra path to load from. --- pyfpdb/Mucked.py | 7 ++++++- setup.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py index c4a6e4f1..6da35f6d 100755 --- a/pyfpdb/Mucked.py +++ b/pyfpdb/Mucked.py @@ -63,7 +63,12 @@ class Aux_Window(object): card_images = 53 * [0] suits = ('s', 'h', 'd', 'c') ranks = (14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2) - pb = gtk.gdk.pixbuf_new_from_file(self.config.execution_path(self.params['deck'])) + deckimg = self.params['deck'] + try: + pb = gtk.gdk.pixbuf_new_from_file(self.config.execution_path(deckimg)) + except: + stockpath = '/usr/share/python-fpdb/' + deckimg + pb = gtk.gdk.pixbuf_new_from_file(stockpath) for j in range(0, 13): for i in range(0, 4): diff --git a/setup.py b/setup.py index 737ad18e..31907f99 100644 --- a/setup.py +++ b/setup.py @@ -19,6 +19,6 @@ setup(name = 'fpdb', ('/usr/share/applications', ['files/fpdb.desktop']), ('/usr/share/python-fpdb', - ['pyfpdb/logging.conf']) + ['pyfpdb/logging.conf', 'pyfpdb/Cards01.png']) ] )