diff options
author | Simon Schampijer <simon@schampijer.de> | 2007-09-24 13:19:31 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2007-09-24 13:19:31 (GMT) |
commit | d85f9a04075107e799d7a748bbbc96f7f43ae73e (patch) | |
tree | 6bf68d80ccb80dc4d3e89d78160c51dd4675bb44 /cardtable.py | |
parent | 7b8800191ad29440393ce1649a7d82419ef6fa5f (diff) | |
parent | e3af6ee47390ac2bde75a6c31f85c091fdc3bce2 (diff) |
Merge branch 'develop'
Diffstat (limited to 'cardtable.py')
-rwxr-xr-x | cardtable.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cardtable.py b/cardtable.py index 70f70b1..f1a992c 100755 --- a/cardtable.py +++ b/cardtable.py @@ -69,8 +69,6 @@ class CardTable(gtk.EventBox): else: text1 = str(self.data.get('face','')) text2 = str(self.data.get('face','')) - buffer_card_1 = svgcard.SvgCard(-1, {'front_border':{'opacity':'0'}, 'front_h_border':{'opacity':'0.5'}, 'back_text':{'card_text':text1}}, {}, None, self.card_size,1) - buffer_card_2 = svgcard.SvgCard(-1, {'front_border':{'opacity':'0'}, 'front_h_border':{'opacity':'0.5'}, 'back_text':{'card_text':text2}}, {}, None, self.card_size,1) x = 0 y = 0 @@ -82,18 +80,14 @@ class CardTable(gtk.EventBox): else: jpg = None props = {} - props['front_border'] = {'opacity':'1'} - props['front_h_border'] ={'opacity':'1'} props['front_text']= {'card_text':card.get('char', '')} if card['ab']== 'a': - buffer_card = buffer_card_1 props['back_text']= {'card_text':text1} elif card['ab']== 'b': - buffer_card = buffer_card_2 props['back_text']= {'card_text':text2} - card = svgcard.SvgCard(id, props, buffer_card.get_cache(), jpg, self.card_size,self.data.get('align','1')) + card = svgcard.SvgCard(id, props, jpg, self.card_size,self.data.get('align','1')) card.connect('enter-notify-event', self.mouse_event, [x, y]) card.connect("button-press-event", self.flip_card_mouse, id) self.table_positions[(x, y)]=1 @@ -116,8 +110,9 @@ class CardTable(gtk.EventBox): for card in self.cards.values(): self.table.remove(card) del card - self.load_game(None, data, grid) gc.collect() + self.load_game(None, data, grid) + def get_card_size(self, size_table): x = (780 - (11*size_table))/size_table |